#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
#include "mutt.h"
-#include "buffer.h"
-#include "ascii.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "history.h"
#include "mx.h"
#include "init.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include "lib/list.h"
#include "lib/debug.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));
} else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
- size_t Maildirlength = str_len (Maildir);
+ size_t Maildirlength = m_strlen(Maildir);
/*
* if name starts with $folder, just strip it to keep hierarchy
*/
if (Maildirlength > 0 && str_ncmp (CurrentFolder, Maildir,
Maildirlength) == 0 &&
- str_len (CurrentFolder) > Maildirlength) {
+ m_strlen(CurrentFolder) > Maildirlength) {
val = CurrentFolder + Maildirlength;
if (Maildir[strlen(Maildir)-1]!='/')
val += 1;
* just silently ignore it */
if (!dst)
return (1);
- if (str_len ((char*) dst->data) == 0)
- dst->data = (unsigned long) str_dup (val);
+ if (m_strlen((char*) dst->data) == 0)
+ dst->data = (unsigned long) m_strdup(val);
else {
char* s = (char*) dst->data;
str_replace (&s, val);
}
- if (str_len (dst->init) == 0)
- dst->init = str_dup ((char*) dst->data);
+ if (m_strlen(dst->init) == 0)
+ dst->init = m_strdup((char*) dst->data);
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.");
}
if (!((rx_t*) dst->data))
- *((rx_t**) dst->data) = mem_calloc (1, sizeof(rx_t));
+ *((rx_t**) dst->data) = p_new(rx_t, 1);
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);
debug_print (1, ("orig == '%s'\n", tmp));
t = strchr (tmp, '=');
t++;
- l = str_len (t);
+ l = m_strlen(t);
if (l >= 2) {
if (t[l-1] == '"' && *t == '"') {
t[l-1] = '\0';
/* for synonym warning reports: adds synonym to end of list */
static void syn_add (struct option_t* n, struct option_t* o) {
syn_t* tmp = p_new(syn_t, 1);
- tmp->f = str_dup (CurRCFile);
+ tmp->f = m_strdup(CurRCFile);
tmp->l = CurRCLine;
tmp->n = n;
tmp->o = o;
}
if (!*list || last) {
- t = (LIST *) mem_calloc (1, sizeof(LIST));
- t->data = str_dup (str);
+ t = p_new(LIST, 1);
+ t->data = m_strdup(str);
if (last) {
last->next = t;
last = last->next;
}
/* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
- t->template = str_dup (templ);
+ t->template = m_strdup(templ);
/* Find highest match number in template string */
t->nmatch = 0;
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);
}
BUFFER token;
struct option_t* option = NULL;
- memset (&token, 0, sizeof(token));
+ p_clear(&token, 1);
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
continue;
for (j = 0; b[j].name; j++)
- if (!ascii_strncasecmp (tmp->data, b[j].name, str_len (tmp->data))
- && (str_len (b[j].name) == str_len (tmp->data))) {
+ if (!ascii_strncasecmp (tmp->data, b[j].name, m_strlen(tmp->data))
+ && (m_strlen(b[j].name) == m_strlen(tmp->data))) {
res = 1;
break;
}
}
/* check for feature_* */
if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
- (j = str_len (tmp->data)) > 8) {
+ (j = m_strlen(tmp->data)) > 8) {
i = 0;
while (Features[i]) {
- if (str_len (Features[i]) == j-8 &&
+ if (m_strlen(Features[i]) == j-8 &&
ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
res = 1;
break;
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;
{
BUFFER templ;
- memset (&templ, 0, sizeof(templ));
+ p_clear(&templ, 1);
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
/* 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;
/*
* Check for deletion of entire list
*/
- if (str_cmp (buf->data, "*") == 0) {
+ if (m_strcmp(buf->data, "*") == 0) {
mutt_free_list ((LIST **) data);
break;
}
/* some cheap hacks that I expect to remove */
if (!str_casecmp(buf->data, "any"))
- a->major = str_dup("*/.*");
+ a->major = m_strdup("*/.*");
else if (!str_casecmp(buf->data, "none"))
- a->major = str_dup("cheap_hack/this_should_never_match");
+ a->major = m_strdup("cheap_hack/this_should_never_match");
else
- a->major = str_dup(buf->data);
+ a->major = m_strdup(buf->data);
if ((p = strchr(a->major, '/'))) {
*p = '\0';
a->minor = "unknown";
}
- len = str_len (a->minor);
+ len = m_strlen(a->minor);
tmpminor = p_new(char, len + 3);
strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
tmpminor[0] = '^';
mutt_extract_token (buf, s, 0);
if (!str_casecmp(buf->data, "any"))
- tmp = str_dup("*/.*");
+ tmp = m_strdup("*/.*");
else if (!str_casecmp(buf->data, "none"))
- tmp = str_dup("cheap_hack/this_should_never_match");
+ tmp = m_strdup("cheap_hack/this_should_never_match");
else
- tmp = str_dup(buf->data);
+ tmp = m_strdup(buf->data);
if ((minor = strchr(tmp, '/'))) {
*minor = '\0';
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;
if (!tmp) {
/* create a new alias */
- tmp = (ALIAS *) mem_calloc (1, sizeof(ALIAS));
+ tmp = p_new(ALIAS, 1);
tmp->self = tmp;
- tmp->name = str_dup (buf->data);
+ tmp->name = m_strdup(buf->data);
/* give the main addressbook code a chance */
if (CurrentMenu == MENU_ALIAS)
set_option (OPTMENUCALLER);
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;
last = NULL;
- l = str_len (buf->data);
+ l = m_strlen(buf->data);
if (buf->data[l - 1] == ':')
l--;
/* replace the old value */
p_delete(&tmp->data);
tmp->data = buf->data;
- memset (buf, 0, sizeof(BUFFER));
+ p_clear(buf, 1);
return 0;
}
if (!tmp->next)
UserHeader = tmp;
}
tmp->data = buf->data;
- memset (buf, 0, sizeof(BUFFER));
+ p_clear(buf, 1);
return 0;
}
return;
mutt_option_value(ptr->option, buf, sizeof(buf));
- if (str_len(ptr->init) == 0 && buf && *buf)
- ptr->init = str_dup(buf);
+ if (m_strlen(ptr->init) == 0 && buf && *buf)
+ ptr->init = m_strdup(buf);
}
static struct option_t* add_option (const char* name, const char* init,
short type, short dodup) {
- struct option_t* option = mem_calloc (1, sizeof(struct option_t));
+ struct option_t* option = p_new(struct option_t, 1);
debug_print (1, ("adding $%s\n", name));
- option->option = str_dup (name);
+ option->option = m_strdup(name);
option->type = type;
if (init)
- option->init = dodup ? str_dup (init) : (char*) init;
+ option->init = dodup ? m_strdup(init) : (char*) init;
return (option);
}
/* only expand for string as it's the only place where
* we want to expand vars right now */
if (src->init && *src->init) {
- memset (&token, 0, sizeof(BUFFER));
- memset (&in, 0, sizeof(BUFFER));
- len = str_len (src->init) + 2;
+ p_clear(&token, 1);
+ p_clear(&in, 1);
+ len = m_strlen(src->init) + 2;
in.data = p_new(char, len + 1);
snprintf (in.data, len, "\"%s\"", src->init);
in.dptr = in.data;
in.dsize = len;
mutt_extract_token (&token, &in, 0);
if (token.data && *token.data)
- *dst = str_dup (token.data);
+ *dst = m_strdup(token.data);
else
- *dst = str_dup ("");
+ *dst = m_strdup("");
p_delete(&in.data);
p_delete(&token.data);
} else
- *dst = str_dup ("");
+ *dst = m_strdup("");
} else
/* for non-string: take value as is */
- *dst = str_dup (src->init);
+ *dst = m_strdup(src->init);
return (1);
}
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));
}
}
}
- 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);
}
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);
}
- memset (&token, 0, sizeof(token));
+ p_clear(&token, 1);
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
- currentline = str_dup (linebuf);
+ currentline = m_strdup(linebuf);
if (!currentline)
continue;
mutt_convert_string (¤tline, ConfigCharset, Charset, 0);
int i, r = -1;
BUFFER expn;
- memset (&expn, 0, sizeof(expn));
+ p_clear(&expn, 1);
expn.data = expn.dptr = line;
- expn.dsize = str_len (line);
+ expn.dsize = m_strlen(line);
*err->data = 0;
}
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 (numtabs == 1) {
Num_matched = 0;
strfcpy (User_typed, pt, sizeof(User_typed));
- memset (Matches, 0, sizeof(Matches));
- memset (Completed, 0, sizeof(Completed));
+ p_clear(Matches, sizeof(Matches));
+ p_clear(Completed, sizeof(Completed));
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
sizeof(Completed));
/* loop through all the possible prefixes (no, inv, ...) */
if (!str_ncmp (buffer, "set", 3)) {
for (num = 0; prefixes[num]; num++) {
- if (!str_ncmp (pt, prefixes[num], str_len (prefixes[num]))) {
- pt += str_len (prefixes[num]);
+ if (!str_ncmp (pt, prefixes[num], m_strlen(prefixes[num]))) {
+ pt += m_strlen(prefixes[num]);
break;
}
}
if (numtabs == 1) {
Num_matched = 0;
strfcpy (User_typed, pt, sizeof(User_typed));
- memset (Matches, 0, sizeof(Matches));
- memset (Completed, 0, sizeof(Completed));
+ p_clear(Matches, sizeof(Matches));
+ p_clear(Completed, sizeof(Completed));
for (num = 0; MuttVars[num].option; num++)
- candidate (Completed, User_typed, MuttVars[num].option,
- sizeof(Completed));
+ candidate(Completed, User_typed, MuttVars[num].option,
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
if (numtabs == 1) {
Num_matched = 0;
strfcpy (User_typed, pt, sizeof(User_typed));
- memset (Matches, 0, sizeof(Matches));
- memset (Completed, 0, sizeof(Completed));
+ p_clear(Matches, sizeof(Matches));
+ p_clear(Completed, sizeof(Completed));
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
if (str_ncmp (buffer, "set", 3) == 0) {
strfcpy (var, pt, sizeof(var));
/* ignore the trailing '=' when comparing */
- var[str_len (var) - 1] = 0;
+ var[m_strlen(var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
return 0; /* no such variable. */
else {
BUFFER err, token;
- memset (&err, 0, sizeof(err));
- memset (&token, 0, sizeof(token));
+ p_clear(&err, 1);
+ p_clear(&token, 1);
err.data = errbuff;
err.dsize = sizeof(errbuff);
BUFFER err, token;
char errstr[SHORT_STRING];
- memset (&err, 0, sizeof(err));
+ p_clear(&err, 1);
err.data = errstr;
err.dsize = sizeof(errstr);
- memset (&token, 0, sizeof(token));
+ p_clear(&token, 1);
for (; p; p = p->next) {
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
int i, default_rc = 0, need_pause = 0;
BUFFER err;
- memset (&err, 0, sizeof(err));
+ p_clear(&err, 1);
err.data = error;
err.dsize = sizeof(error);
/* on one of the systems I use, getcwd() does not return the same prefix
as is listed in the passwd file */
if ((p = getenv ("HOME")))
- Homedir = str_dup (p);
+ Homedir = m_strdup(p);
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- Username = str_dup (pw->pw_name);
+ Username = m_strdup(pw->pw_name);
if (!Homedir)
- Homedir = str_dup (pw->pw_dir);
+ Homedir = m_strdup(pw->pw_dir);
- Realname = str_dup (mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
- Shell = str_dup (pw->pw_shell);
+ Realname = m_strdup(mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
+ Shell = m_strdup(pw->pw_shell);
endpwent ();
}
else {
exit (1);
}
if ((p = getenv ("USER")))
- Username = str_dup (p);
+ Username = m_strdup(p);
else {
mutt_endwin (NULL);
fputs (_("unable to determine username"), stderr);
exit (1);
}
- Shell = str_dup ((p = getenv ("SHELL")) ? p : "/bin/sh");
+ Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh");
}
debug_start(Homedir);
strfcpy (buffer, p, sizeof(buffer)); /* save the domain for below */
}
else
- Hostname = str_dup (utsname.nodename);
+ Hostname = m_strdup(utsname.nodename);
#ifndef DOMAIN
#define DOMAIN buffer
if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
- Fqdn = str_dup ("@");
+ Fqdn = m_strdup("@");
else
#endif /* DOMAIN */
if (*DOMAIN != '@') {
- Fqdn = p_new(char, str_len(DOMAIN) + str_len(Hostname) + 2);
+ Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
}
else
- Fqdn = str_dup (NONULL (Hostname));
+ Fqdn = m_strdup(NONULL (Hostname));
#ifdef USE_NNTP
{
while (*q && !isspace(*q))
q++;
*q = '\0';
- NewsServer = str_dup (p);
+ NewsServer = m_strdup(p);
fclose (f);
}
}
if ((p = getenv ("NNTPSERVER")))
- NewsServer = str_dup (p);
+ NewsServer = m_strdup(p);
#endif
if ((p = getenv ("MAIL")))
- Spoolfile = str_dup (p);
+ Spoolfile = m_strdup(p);
else if ((p = getenv ("MAILDIR")))
- Spoolfile = str_dup (p);
+ Spoolfile = m_strdup(p);
else {
#ifdef HOMESPOOL
mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
#else
mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
#endif
- Spoolfile = str_dup (buffer);
+ Spoolfile = m_strdup(buffer);
}
if ((p = getenv ("MAILCAPS")))
- MailcapPath = str_dup (p);
+ MailcapPath = m_strdup(p);
else {
/* Default search path from RFC1524 */
MailcapPath =
- str_dup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
+ m_strdup("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
"/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
}
- Tempdir = str_dup ((p = getenv ("TMPDIR")) ? p : "/tmp");
+ Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
p = getenv ("VISUAL");
if (!p) {
if (!p)
p = "vi";
}
- Editor = str_dup (p);
- Visual = str_dup (p);
+ Editor = m_strdup(p);
+ Visual = m_strdup(p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
- memset (&buf, 0, sizeof(buf));
+ p_clear(&buf, 1);
buf.data = buf.dptr = buffer;
- buf.dsize = str_len (buffer);
+ buf.dsize = m_strlen(buffer);
- memset (&token, 0, sizeof(token));
+ p_clear(&token, 1);
parse_my_hdr (&token, &buf, 0, &err);
p_delete(&token.data);
}
NONULL (Homedir));
default_rc = 1;
- Muttrc = str_dup (buffer);
+ Muttrc = m_strdup(buffer);
}
else {
strfcpy (buffer, Muttrc, sizeof(buffer));
p_delete(&Muttrc);
mutt_expand_path (buffer, sizeof(buffer));
- Muttrc = str_dup (buffer);
+ Muttrc = m_strdup(buffer);
}
p_delete(&AliasFile);
- AliasFile = str_dup (NONULL (Muttrc));
+ AliasFile = m_strdup(NONULL (Muttrc));
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
/* 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