projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more files.
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
6ac482f
..
6545888
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-14,17
+14,23
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#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 <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "buffer.h"
-#include "ascii.h"
-#include "mapping.h"
-#include "mutt_curses.h"
#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
#include "thread.h"
#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
#include "thread.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
@@
-38,9
+44,6
@@
#include "mx.h"
#include "init.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"
#include "lib/rx.h"
#include "lib/list.h"
#include "lib/debug.h"
@@
-61,7
+64,7
@@
static int parse_sort (struct option_t* dst, const char *s,
const struct mapping_t *map,
char* errbuf, size_t errlen);
const struct mapping_t *map,
char* errbuf, size_t errlen);
-static HASH
*
ConfigOptions = NULL;
+static HASH
*
ConfigOptions = NULL;
/* for synonym warning reports: synonym found during parsing */
typedef struct {
/* for synonym warning reports: synonym found during parsing */
typedef struct {
@@
-184,7
+187,8
@@
static void bool_to_string (char* dst, size_t dstlen,
}
static int bool_from_string (struct option_t* dst, const char* val,
}
static int bool_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)),
+ size_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst)
int flag = -1;
if (!dst)
@@
-206,7
+210,7
@@
static int bool_from_string (struct option_t* dst, const char* val,
static void num_to_string (char* dst, size_t dstlen,
struct option_t* option) {
/* XXX puke */
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));
"%s=%04o" : "%s=%d";
snprintf (dst, dstlen, fmt, option->option,
*((short*) option->data));
@@
-260,26
+264,26
@@
static void sys_to_string (char* dst, size_t dstlen,
char *val = NULL, *t = NULL;
int clean = 0;
char *val = NULL, *t = NULL;
int clean = 0;
- /* get some $m
uttng
_ values dynamically */
- if (ascii_strcmp ("m
uttng
_pwd", option->option) == 0) {
- val =
mem_malloc (
_POSIX_PATH_MAX);
+ /* get some $m
admutt
_ values dynamically */
+ if (ascii_strcmp ("m
admutt
_pwd", option->option) == 0) {
+ val =
p_new(char,
_POSIX_PATH_MAX);
val = getcwd (val, _POSIX_PATH_MAX-1);
clean = 1;
val = getcwd (val, _POSIX_PATH_MAX-1);
clean = 1;
- } else if (ascii_strcmp ("m
uttng
_folder_path", option->option) == 0 &&
+ } else if (ascii_strcmp ("m
admutt
_folder_path", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
- } else if (ascii_strcmp ("m
uttng
_folder_name", option->option) == 0 &&
+ } else if (ascii_strcmp ("m
admutt
_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
CurrentFolder && *CurrentFolder) {
- s
ize_t Maildirlength = str_len
(Maildir);
+ s
size_t Maildirlength = m_strlen
(Maildir);
/*
* if name starts with $folder, just strip it to keep hierarchy
* $folder=imap://host, path=imap://host/inbox/b -> inbox/b
*/
/*
* 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 &&
Maildirlength) == 0 &&
-
str_len
(CurrentFolder) > Maildirlength) {
+
m_strlen
(CurrentFolder) > Maildirlength) {
val = CurrentFolder + Maildirlength;
if (Maildir[strlen(Maildir)-1]!='/')
val += 1;
val = CurrentFolder + Maildirlength;
if (Maildir[strlen(Maildir)-1]!='/')
val += 1;
@@
-288,32
+292,32
@@
static void sys_to_string (char* dst, size_t dstlen,
val = t+1;
/* default: use as-is */
else
val = t+1;
/* default: use as-is */
else
- val = CurrentFolder;
+ val =
(char *)
CurrentFolder;
} else
} else
- val = option->init;
+ val =
(char *)
option->init;
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
if (clean)
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
if (clean)
-
mem_free
(&val);
+
p_delete
(&val);
}
static int path_from_string (struct option_t* dst, const char* val,
}
static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf
, size_t errlen
) {
+ char* errbuf
__attribute__ ((unused)), size_t errlen __attribute__ ((unused))
) {
char path[_POSIX_PATH_MAX];
if (!dst)
return (0);
if (!val || !*val) {
char path[_POSIX_PATH_MAX];
if (!dst)
return (0);
if (!val || !*val) {
-
mem_free
((char**) dst->data);
+
p_delete
((char**) dst->data);
return (1);
}
path[0] = '\0';
return (1);
}
path[0] = '\0';
-
strfcpy (path, val, sizeof (path)
);
- mutt_expand_path (path, sizeof
(path));
-
str_replace
((char **) dst->data, path);
+
m_strcpy(path, sizeof(path), val
);
+ mutt_expand_path (path, sizeof(path));
+
m_strreplace
((char **) dst->data, path);
return (1);
}
return (1);
}
@@
-325,25
+329,25
@@
static int str_from_string (struct option_t* dst, const char* val,
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
return (0);
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
return (0);
-
str_replace
((char**) dst->data, val);
+
m_strreplace
((char**) dst->data, val);
return (1);
}
static int user_from_string (struct option_t* dst, const char* val,
return (1);
}
static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf
, size_t errlen
) {
+ char* errbuf
__attribute__ ((unused)), size_t errlen __attribute__ ((unused))
) {
/* if dst == NULL, we may get here in case the user did unset it,
* see parse_set() where item is free()'d before coming here; so
* just silently ignore it */
if (!dst)
return (1);
/* if dst == NULL, we may get here in case the user did unset it,
* see parse_set() where item is free()'d before coming here; so
* 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;
else {
char* s = (char*) dst->data;
-
str_replace
(&s, val);
+
m_strreplace
(&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);
}
return (1);
}
@@
-355,7
+359,7
@@
static void quad_to_string (char* dst, size_t dstlen,
}
static int quad_from_string (struct option_t* dst, const char* val,
}
static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf
, size_t errlen
) {
+ char* errbuf
__attribute__ ((unused)), size_t errlen __attribute__ ((unused))
) {
int flag = -1;
if (!dst)
int flag = -1;
if (!dst)
@@
-382,7
+386,7
@@
static void sort_to_string (char* dst, size_t dstlen,
const char *p = NULL;
if (!map) {
const char *p = NULL;
if (!map) {
- snprintf (dst, sizeof
(dst), "%s=unknown", option->option);
+ snprintf (dst, sizeof(dst), "%s=unknown", option->option);
return;
}
return;
}
@@
-426,7
+430,7
@@
static int rx_from_string (struct option_t* dst, const char* val,
if (!dst)
return (0);
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 (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
@@
-434,42
+438,42
@@
static int rx_from_string (struct option_t* dst, const char* val,
}
if (!((rx_t*) dst->data))
}
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? */
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);
return (1);
- if (
str_cmp
(dst->option, "mask") != 0)
+ if (
m_strcmp
(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
s = (char*) val;
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++;
}
not = 1;
s++;
}
- rx =
mem_malloc (sizeof (regex_t)
);
+ rx =
p_new(regex_t, 1
);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
regfree (rx);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
regfree (rx);
-
mem_free
(&rx);
+
p_delete
(&rx);
return (0);
}
if (p->rx) {
regfree (p->rx);
return (0);
}
if (p->rx) {
regfree (p->rx);
-
mem_free
(&p->rx);
+
p_delete
(&p->rx);
}
}
-
str_replace
(&p->pattern, val);
+
m_strreplace
(&p->pattern, val);
p->rx = rx;
p->not = not;
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);
mutt_adjust_all_subjects ();
return (1);
@@
-489,7
+493,7
@@
static void magic_to_string (char* dst, size_t dstlen,
}
static int magic_from_string (struct option_t* dst, const char* val,
}
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf
, size_t errlen
) {
+ char* errbuf
__attribute__ ((unused)), size_t errlen __attribute__ ((unused))
) {
int flag = -1;
if (!dst || !val || !*val)
int flag = -1;
if (!dst || !val || !*val)
@@
-515,17
+519,17
@@
static void addr_to_string (char* dst, size_t dstlen,
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
- rfc822_write_address (s, sizeof
(s), *((ADDRESS
**) option->data), 0);
+ rfc822_write_address (s, sizeof
(s), *((address_t
**) option->data), 0);
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
static int addr_from_string (struct option_t* dst, const char* val,
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf
, size_t errlen
) {
+ char* errbuf
__attribute__ ((unused)), size_t errlen __attribute__ ((unused))
) {
if (!dst)
return (0);
if (!dst)
return (0);
-
rfc822_free_address ((ADDRESS
**) dst->data);
+
address_delete ((address_t
**) dst->data);
if (val && *val)
if (val && *val)
- *((
ADDRESS
**) dst->data) = rfc822_parse_adrlist (NULL, val);
+ *((
address_t
**) dst->data) = rfc822_parse_adrlist (NULL, val);
return (1);
}
return (1);
}
@@
-539,7
+543,7
@@
int mutt_option_value (const char* val, char* dst, size_t dstlen) {
*dst = '\0';
return (0);
}
*dst = '\0';
return (0);
}
- tmp =
mem_malloc (
dstlen+1);
+ tmp =
p_new(char,
dstlen+1);
FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
/* as we get things of type $var=value and don't want to bloat the
FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
/* as we get things of type $var=value and don't want to bloat the
@@
-547,7
+551,7
@@
int mutt_option_value (const char* val, char* dst, size_t dstlen) {
debug_print (1, ("orig == '%s'\n", tmp));
t = strchr (tmp, '=');
t++;
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';
if (l >= 2) {
if (t[l-1] == '"' && *t == '"') {
t[l-1] = '\0';
@@
-555,7
+559,7
@@
int mutt_option_value (const char* val, char* dst, size_t dstlen) {
}
}
memcpy (dst, t, l+1);
}
}
memcpy (dst, t, l+1);
-
mem_free
(&tmp);
+
p_delete
(&tmp);
debug_print (1, ("stripped == '%s'\n", dst));
return (1);
debug_print (1, ("stripped == '%s'\n", dst));
return (1);
@@
-563,8
+567,8
@@
int mutt_option_value (const char* val, char* dst, size_t dstlen) {
/* for synonym warning reports: adds synonym to end of list */
static void syn_add (struct option_t* n, struct option_t* o) {
/* 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 =
mem_malloc (sizeof (syn_t)
);
- tmp->f =
str_dup
(CurRCFile);
+ syn_t* tmp =
p_new(syn_t, 1
);
+ tmp->f =
m_strdup
(CurRCFile);
tmp->l = CurRCLine;
tmp->n = n;
tmp->o = o;
tmp->l = CurRCLine;
tmp->n = n;
tmp->o = o;
@@
-573,8
+577,8
@@
static void syn_add (struct option_t* n, struct option_t* o) {
/* for synonym warning reports: free single item (for list_del()) */
static void syn_del (void** p) {
/* for synonym warning reports: free single item (for list_del()) */
static void syn_del (void** p) {
-
mem_fre
e(&(*(syn_t**) p)->f);
-
mem_fre
e(p);
+
p_delet
e(&(*(syn_t**) p)->f);
+
p_delet
e(p);
}
void toggle_quadoption (int opt)
}
void toggle_quadoption (int opt)
@@
-640,8
+644,8
@@
static void add_to_list (LIST ** list, const char *str)
}
if (!*list || last) {
}
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;
if (last) {
last->next = t;
last = last->next;
@@
-699,7
+703,7
@@
static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
* the template, and leaving t pointed at the current item.
*/
t = last;
* the template, and leaving t pointed at the current item.
*/
t = last;
-
mem_free(
t->template);
+
p_delete(&
t->template);
break;
}
if (!last->next)
break;
}
if (!last->next)
@@
-719,7
+723,7
@@
static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
}
/* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
}
/* 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;
/* Find highest match number in template string */
t->nmatch = 0;
@@
-748,21
+752,21
@@
static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
spam = *list;
if (!spam)
return 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);
*list = spam->next;
rx_free (&spam->rx);
-
mem_fre
e(&spam->template);
-
mem_fre
e(&spam);
+
p_delet
e(&spam->template);
+
p_delet
e(&spam);
return 1;
}
prev = spam;
for (spam = prev->next; spam;) {
return 1;
}
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);
prev->next = spam->next;
rx_free (&spam->rx);
-
mem_free(
spam->template);
-
mem_free(
spam);
+
p_delete(&
spam->template);
+
p_delete(&
spam);
spam = prev->next;
++nremoved;
}
spam = prev->next;
++nremoved;
}
@@
-778,19
+782,19
@@
static void remove_from_list (LIST ** l, const char *str)
{
LIST *p, *last = NULL;
{
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;
last = NULL;
while (p) {
if (ascii_strcasecmp (str, p->data) == 0) {
mutt_free_list (l); /* ``unCMD *'' means delete all current entries */
else {
p = *l;
last = NULL;
while (p) {
if (ascii_strcasecmp (str, p->data) == 0) {
-
mem_free
(&p->data);
+
p_delete
(&p->data);
if (last)
last->next = p->next;
else
(*l) = p->next;
if (last)
last->next = p->next;
else
(*l) = p->next;
-
mem_free
(&p);
+
p_delete
(&p);
}
else {
last = p;
}
else {
last = p;
@@
-804,7
+808,7
@@
static int remove_from_rx_list (list2_t** l, const char *str)
{
int i = 0;
{
int i = 0;
- if (
str_cmp
("*", str) == 0) {
+ if (
m_strcmp
("*", str) == 0) {
list_del (l, (list_del_t*) rx_free);
return (0);
}
list_del (l, (list_del_t*) rx_free);
return (0);
}
@@
-822,11
+826,12
@@
static int remove_from_rx_list (list2_t** l, const char *str)
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
- int i, j, res = 0;
+ int i, j;
+ unsigned long res = 0;
BUFFER token;
struct option_t* option = NULL;
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? */
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
@@
-840,8
+845,8
@@
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
continue;
for (j = 0; b[j].name; j++)
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;
}
res = 1;
break;
}
@@
-849,10
+854,10
@@
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
}
/* check for feature_* */
if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
}
/* 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]) {
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;
ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
res = 1;
break;
@@
-874,16
+879,17
@@
static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
if (data == res) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
if (data == res) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
return (-1);
}
return (-1);
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
}
return 0;
}
}
return 0;
}
-static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
{
do {
mutt_extract_token (buf, s, 0);
@@
-899,8
+905,9
@@
static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_ignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
{
do {
mutt_extract_token (buf, s, 0);
@@
-912,8
+919,9
@@
static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_list (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_list (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
{
do {
mutt_extract_token (buf, s, 0);
@@
-934,8
+942,9
@@
static void _alternates_clean (void)
}
}
}
}
-static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_alternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
{
_alternates_clean ();
do {
@@
-950,15
+959,16
@@
static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&Alternates, buf->data);
{
_alternates_clean ();
do {
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;
add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
return -1;
@@
-973,14
+983,14
@@
static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
{
BUFFER templ;
{
BUFFER templ;
-
memset (&templ, 0, sizeof (templ)
);
+
p_clear(&templ, 1
);
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
if (data == M_SPAM)
/* 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
else
-
strfcpy (err->data, _("nospam: no matching pattern"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("nospam: no matching pattern")
);
return -1;
}
return -1;
}
@@
-995,10
+1005,10
@@
static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
-
mem_free
(&templ.data);
+
p_delete
(&templ.data);
return -1;
}
return -1;
}
-
mem_free
(&templ.data);
+
p_delete
(&templ.data);
}
/* If not, try to remove from the nospam list. */
}
/* If not, try to remove from the nospam list. */
@@
-1014,7
+1024,7
@@
static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
/* nospam only ever has one parameter. */
/* "*" is a special case. */
/* 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;
mutt_free_spam_list (&SpamList);
list_del (&NoSpamList, (list_del_t*) rx_free);
return 0;
@@
-1032,19
+1042,19
@@
static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
}
/* This should not happen. */
}
/* 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;
}
static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
return -1;
}
static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+ BUFFER * err
__attribute__ ((unused))
)
{
do {
mutt_extract_token (buf, s, 0);
/*
* Check for deletion of entire list
*/
{
do {
mutt_extract_token (buf, s, 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;
}
mutt_free_list ((LIST **) data);
break;
}
@@
-1055,7
+1065,8
@@
static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_lists (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_lists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
do {
BUFFER * err)
{
do {
@@
-1080,7
+1091,7
@@
static void _attachments_clean (void) {
}
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
}
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
- BUFFER *err) {
+ BUFFER *err
__attribute__ ((unused))
) {
ATTACH_MATCH *a;
LIST *listp, *lastp;
char *p;
ATTACH_MATCH *a;
LIST *listp, *lastp;
char *p;
@@
-1089,8
+1100,8
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
/* Find the last item in the list that data points to. */
lastp = NULL;
/* Find the last item in the list that data points to. */
lastp = NULL;
- debug_print (5, ("parse_attach_list: ldata = %
08x, *ldata = %08x
\n",
-
(unsigned int)ldata, (unsigned int)
*ldata));
+ debug_print (5, ("parse_attach_list: ldata = %
p, *ldata = %p
\n",
+
ldata,
*ldata));
for (listp = *ldata; listp; listp = listp->next) {
a = (ATTACH_MATCH *)listp->data;
debug_print (5, ("parse_attach_list: skipping %s/%s\n", a->major, a->minor));
for (listp = *ldata; listp; listp = listp->next) {
a = (ATTACH_MATCH *)listp->data;
debug_print (5, ("parse_attach_list: skipping %s/%s\n", a->major, a->minor));
@@
-1103,15
+1114,15
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
if (!buf->data || *buf->data == '\0')
continue;
if (!buf->data || *buf->data == '\0')
continue;
- a =
mem_malloc(sizeof(ATTACH_MATCH)
);
+ a =
p_new(ATTACH_MATCH, 1
);
/* some cheap hacks that I expect to remove */
/* some cheap hacks that I expect to remove */
- if (!
str_
casecmp(buf->data, "any"))
- a->major =
str_
dup("*/.*");
- else if (!
str_
casecmp(buf->data, "none"))
- a->major =
str_
dup("cheap_hack/this_should_never_match");
+ if (!
m_str
casecmp(buf->data, "any"))
+ a->major =
m_str
dup("*/.*");
+ else if (!
m_str
casecmp(buf->data, "none"))
+ a->major =
m_str
dup("cheap_hack/this_should_never_match");
else
else
- a->major =
str_
dup(buf->data);
+ a->major =
m_str
dup(buf->data);
if ((p = strchr(a->major, '/'))) {
*p = '\0';
if ((p = strchr(a->major, '/'))) {
*p = '\0';
@@
-1121,8
+1132,8
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
a->minor = "unknown";
}
a->minor = "unknown";
}
- len =
str_len
(a->minor);
- tmpminor =
mem_malloc(len+
3);
+ len =
m_strlen
(a->minor);
+ tmpminor =
p_new(char, len +
3);
strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
tmpminor[0] = '^';
tmpminor[len+1] = '$';
strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
tmpminor[0] = '^';
tmpminor[len+1] = '$';
@@
-1131,12
+1142,12
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
a->major_int = mutt_check_mime_type(a->major);
regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
a->major_int = mutt_check_mime_type(a->major);
regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
-
mem_free
(&tmpminor);
+
p_delete
(&tmpminor);
debug_print (5, ("parse_attach_list: added %s/%s [%d]\n",
a->major, a->minor, a->major_int));
debug_print (5, ("parse_attach_list: added %s/%s [%d]\n",
a->major, a->minor, a->major_int));
- listp =
mem_malloc(sizeof(LIST)
);
+ listp =
p_new(LIST, 1
);
listp->data = (char *)a;
listp->next = NULL;
if (lastp) {
listp->data = (char *)a;
listp->next = NULL;
if (lastp) {
@@
-1152,7
+1163,8
@@
static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
return 0;
}
return 0;
}
-static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err) {
+static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
+ BUFFER *err __attribute__ ((unused))) {
ATTACH_MATCH *a;
LIST *lp, *lastp, *newlp;
char *tmp;
ATTACH_MATCH *a;
LIST *lp, *lastp, *newlp;
char *tmp;
@@
-1162,18
+1174,18
@@
static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
do {
mutt_extract_token (buf, s, 0);
do {
mutt_extract_token (buf, s, 0);
- if (!
str_
casecmp(buf->data, "any"))
- tmp =
str_
dup("*/.*");
- else if (!
str_
casecmp(buf->data, "none"))
- tmp =
str_
dup("cheap_hack/this_should_never_match");
+ if (!
m_str
casecmp(buf->data, "any"))
+ tmp =
m_str
dup("*/.*");
+ else if (!
m_str
casecmp(buf->data, "none"))
+ tmp =
m_str
dup("cheap_hack/this_should_never_match");
else
else
- tmp =
str_
dup(buf->data);
+ tmp =
m_str
dup(buf->data);
if ((minor = strchr(tmp, '/'))) {
*minor = '\0';
++minor;
} else {
if ((minor = strchr(tmp, '/'))) {
*minor = '\0';
++minor;
} else {
- minor =
"unknown"
;
+ minor =
m_strdup("unknown")
;
}
major = mutt_check_mime_type(tmp);
}
major = mutt_check_mime_type(tmp);
@@
-1184,11
+1196,11
@@
static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
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));
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_str
casecmp(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);
debug_print(5, ("parse_unattach_list: removed %s/%s [%d]\n",
a->major, a->minor, a->major_int));
regfree(&a->minor_rx);
-
mem_fre
e(&a->major);
+
p_delet
e(&a->major);
/* Relink backward */
if (lastp)
/* Relink backward */
if (lastp)
@@
-1197,8
+1209,8
@@
static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
*ldata = lp->next;
newlp = lp->next;
*ldata = lp->next;
newlp = lp->next;
-
mem_fre
e(&lp->data); /* same as a */
-
mem_fre
e(&lp);
+
p_delet
e(&lp->data); /* same as a */
+
p_delet
e(&lp);
lp = newlp;
continue;
}
lp = newlp;
continue;
}
@@
-1209,7
+1221,7
@@
static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
}
while (MoreArgs (s));
}
while (MoreArgs (s));
-
mem_free
(&tmp);
+
p_delete
(&tmp);
_attachments_clean();
return 0;
}
_attachments_clean();
return 0;
}
@@
-1225,13
+1237,15
@@
static int print_attach_list (LIST *lp, char op, const char *name) {
return 0;
}
return 0;
}
-static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_attachments (BUFFER *buf, BUFFER *s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER *err) {
char op, *category;
LIST **listp;
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
char op, *category;
LIST **listp;
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;
}
return -1;
}
@@
-1256,32
+1270,32
@@
static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
op = '+';
category--;
}
op = '+';
category--;
}
- if (!
str_
ncasecmp(category, "attachment", strlen(category))) {
+ if (!
m_str
ncasecmp(category, "attachment", strlen(category))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!
str_
ncasecmp(category, "inline", strlen(category))) {
+ else if (!
m_str
ncasecmp(category, "inline", strlen(category))) {
if (op == '+')
listp = &InlineAllow;
else
listp = &InlineExclude;
} else {
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;
}
return parse_attach_list(buf, s, listp, err);
}
return -1;
}
return parse_attach_list(buf, s, listp, err);
}
-static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data
__attribute__ ((unused))
, BUFFER *err) {
char op, *p;
LIST **listp;
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
char op, *p;
LIST **listp;
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;
}
return -1;
}
@@
-1291,35
+1305,36
@@
static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
op = '+';
p--;
}
op = '+';
p--;
}
- if (!
str_
ncasecmp(p, "attachment", strlen(p))) {
+ if (!
m_str
ncasecmp(p, "attachment", strlen(p))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!
str_
ncasecmp(p, "inline", strlen(p))) {
+ else if (!
m_str
ncasecmp(p, "inline", strlen(p))) {
if (op == '+')
listp = &InlineAllow;
else
listp = &InlineExclude;
}
else {
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;
}
return parse_unattach_list(buf, s, listp, err);
}
return -1;
}
return parse_unattach_list(buf, s, listp, err);
}
-static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unlists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
remove_from_rx_list (&MailLists, buf->data);
{
do {
mutt_extract_token (buf, s, 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;
}
add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
@@
-1328,7
+1343,7
@@
static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data
__attribute__ ((unused))
,
BUFFER * err)
{
do {
BUFFER * err)
{
do {
@@
-1346,14
+1361,15
@@
static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unsubscribe (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
{
do {
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;
}
add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
@@
-1362,15
+1378,16
@@
static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
ALIAS *tmp, *last = NULL;
do {
mutt_extract_token (buf, s, 0);
{
ALIAS *tmp, *last = NULL;
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 (CurrentMenu == MENU_ALIAS) {
for (tmp = Aliases; tmp; tmp = tmp->next)
tmp->del = 1;
@@
-1382,7
+1399,7
@@
static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
}
else
for (tmp = Aliases; tmp; tmp = tmp->next) {
}
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);
if (CurrentMenu == MENU_ALIAS) {
tmp->del = 1;
set_option (OPTFORCEREDRAWINDEX);
@@
-1404,7
+1421,8
@@
static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
}
return 0;
}
-static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_alias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
ALIAS *tmp = Aliases;
BUFFER * err)
{
ALIAS *tmp = Aliases;
@@
-1412,7
+1430,7
@@
static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
char *estr = NULL;
if (!MoreArgs (s)) {
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);
}
return (-1);
}
@@
-1422,23
+1440,23
@@
static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
/* check to see if an alias with this name already exists */
for (; tmp; tmp = tmp->next) {
/* 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;
}
if (!tmp) {
/* create a new alias */
break;
last = tmp;
}
if (!tmp) {
/* create a new alias */
- tmp =
(ALIAS *) mem_calloc (1, sizeof (ALIAS)
);
+ tmp =
p_new(ALIAS, 1
);
tmp->self = tmp;
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);
}
else {
/* override the previous value */
/* give the main addressbook code a chance */
if (CurrentMenu == MENU_ALIAS)
set_option (OPTMENUCALLER);
}
else {
/* override the previous value */
-
rfc822_free_address
(&tmp->addr);
+
address_delete
(&tmp->addr);
if (CurrentMenu == MENU_ALIAS)
set_option (OPTFORCEREDRAWINDEX);
}
if (CurrentMenu == MENU_ALIAS)
set_option (OPTFORCEREDRAWINDEX);
}
@@
-1458,7
+1476,7
@@
static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
}
#ifdef DEBUG
if (DebugLevel >= 2) {
}
#ifdef DEBUG
if (DebugLevel >= 2) {
-
ADDRESS
*a;
+
address_t
*a;
/* A group is terminated with an empty address, so check a->mailbox */
for (a = tmp->addr; a && a->mailbox; a = a->next) {
/* A group is terminated with an empty address, so check a->mailbox */
for (a = tmp->addr; a && a->mailbox; a = a->next) {
@@
-1473,7
+1491,9
@@
static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
}
static int
}
static int
-parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
+parse_unmy_hdr (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
LIST *last = NULL;
LIST *tmp = UserHeader;
{
LIST *last = NULL;
LIST *tmp = UserHeader;
@@
-1482,13
+1502,13
@@
parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
do {
mutt_extract_token (buf, s, 0);
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;
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--;
if (buf->data[l - 1] == ':')
l--;
@@
-1515,7
+1535,7
@@
parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
return 0;
}
return 0;
}
-static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data
__attribute__ ((unused))
,
BUFFER * err)
{
LIST *tmp;
BUFFER * err)
{
LIST *tmp;
@@
-1524,7
+1544,7
@@
static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
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;
return (-1);
}
keylen = p - buf->data + 1;
@@
-1534,9
+1554,9
@@
static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
-
mem_free
(&tmp->data);
+
p_delete
(&tmp->data);
tmp->data = buf->data;
tmp->data = buf->data;
-
memset (buf, 0, sizeof (BUFFER)
);
+
p_clear(buf, 1
);
return 0;
}
if (!tmp->next)
return 0;
}
if (!tmp->next)
@@
-1550,7
+1570,7
@@
static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
UserHeader = tmp;
}
tmp->data = buf->data;
UserHeader = tmp;
}
tmp->data = buf->data;
-
memset (buf, 0, sizeof (BUFFER)
);
+
p_clear(buf, 1
);
return 0;
}
return 0;
}
@@
-1559,12
+1579,12
@@
parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
char* errbuf, size_t errlen) {
int i, flags = 0;
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;
}
s += 8;
flags = SORT_REVERSE;
}
- if (
str_ncmp
("last-", s, 5) == 0) {
+ if (
m_strncmp
("last-", s, 5) == 0) {
s += 5;
flags |= SORT_LAST;
}
s += 5;
flags |= SORT_LAST;
}
@@
-1580,32
+1600,34
@@
parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
}
/* if additional data more == 1, we want to resolve synonyms */
}
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_set_default (const char* name, void* p, unsigned long more) {
- char buf[LONG_STRING];
- struct option_t* ptr = (struct option_t*) p;
+static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, unsigned long more)
+{
+ char buf[LONG_STRING];
+ struct option_t *ptr = p;
- if (DTYPE (ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find (ConfigOptions, (char*) ptr->data);
- }
- if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
- return;
- mutt_option_value (ptr->option, buf, sizeof (buf));
- if (str_len (ptr->init) == 0 && buf && *buf)
- ptr->init = str_dup (buf);
+ if (DTYPE(ptr->type) == DT_SYN) {
+ if (!more)
+ return;
+ ptr = hash_find(ConfigOptions, (const char *)ptr->data);
+ }
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+ return;
+
+ mutt_option_value(ptr->option, buf, sizeof(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) {
}
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));
debug_print (1, ("adding $%s\n", name));
- option->option =
str_dup
(name);
+ option->option =
m_strdup
(name);
option->type = type;
if (init)
option->type = type;
if (init)
- option->init = dodup ?
str_dup
(init) : (char*) init;
+ option->init = dodup ?
m_strdup
(init) : (char*) init;
return (option);
}
return (option);
}
@@
-1616,51
+1638,51
@@
static struct option_t* add_user_option (const char* name) {
/* free()'s option_t* */
static void del_option (void* p) {
/* 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)));
char* s = (char*) ptr->data;
debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
-
mem_free
(&ptr->option);
-
mem_free
(&s);
-
mem_free
(&ptr->init);
-
mem_free
(&ptr);
+
p_delete
(&ptr->option);
+
p_delete
(&s);
+
p_delete
(&ptr->init);
+
p_delete
(&ptr);
}
static int init_expand (char** dst, struct option_t* src) {
BUFFER token, in;
size_t len = 0;
}
static int init_expand (char** dst, struct option_t* src) {
BUFFER token, in;
size_t len = 0;
-
mem_free
(dst);
+
p_delete
(dst);
if (DTYPE(src->type) == DT_STR ||
DTYPE(src->type) == DT_PATH) {
/* only expand for string as it's the only place where
* we want to expand vars right now */
if (src->init && *src->init) {
if (DTYPE(src->type) == DT_STR ||
DTYPE(src->type) == DT_PATH) {
/* 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;
- in.data =
mem_malloc (len+
1);
+
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)
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
else
- *dst =
str_dup
("");
-
mem_free
(&in.data);
-
mem_free
(&token.data);
+ *dst =
m_strdup
("");
+
p_delete
(&in.data);
+
p_delete
(&token.data);
} else
} else
- *dst =
str_dup
("");
+ *dst =
m_strdup
("");
} else
/* for non-string: take value as is */
} else
/* for non-string: take value as is */
- *dst =
str_dup
(src->init);
+ *dst =
m_strdup
(src->init);
return (1);
}
/* if additional data more == 1, we want to resolve synonyms */
return (1);
}
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_restore_default (const char* name
, void* p
,
- unsigned long more) {
+static void mutt_restore_default (const char* name
__attribute__ ((unused))
,
+
void* p,
unsigned long more) {
char errbuf[STRING];
struct option_t* ptr = (struct option_t*) p;
char* init = NULL;
char errbuf[STRING];
struct option_t* ptr = (struct option_t*) p;
char* init = NULL;
@@
-1675,7
+1697,7
@@
static void mutt_restore_default (const char* name, void* p,
if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
init_expand (&init, ptr);
if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
init_expand (&init, ptr);
if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
- sizeof
(errbuf))) {
+ sizeof(errbuf))) {
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
@@
-1683,7
+1705,7
@@
static void mutt_restore_default (const char* name, void* p,
ptr->option, NONULL (init), errbuf);
exit (1);
}
ptr->option, NONULL (init), errbuf);
exit (1);
}
-
mem_free
(&init);
+
p_delete
(&init);
}
if (ptr->flags & R_INDEX)
}
if (ptr->flags & R_INDEX)
@@
-1701,11
+1723,11
@@
static void mutt_restore_default (const char* name, void* p,
}
/* check whether value for $dsn_return would be valid */
}
/* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* option, unsigned long p,
+static int check_dsn_return (const char* option
__attribute__ ((unused))
, unsigned long p,
char* errbuf, size_t errlen) {
char* val = (char*) 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);
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
return (0);
@@
-1717,7
+1739,8
@@
static int check_dsn_return (const char* option, unsigned long p,
static int check_dsn_notify (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
list2_t* list = NULL;
static int check_dsn_notify (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
list2_t* list = NULL;
- int i = 0, rc = 1;
+ size_t i = 0;
+ int rc = 1;
char* val = (char*) p;
if (!val || !*val)
char* val = (char*) p;
if (!val || !*val)
@@
-1727,17
+1750,17
@@
static int check_dsn_notify (const char* option, unsigned long p,
return (1);
for (i = 0; i < list->length; i++)
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");
rc = 0;
break;
}
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
(char*) list->data[i], "dsn_notify");
rc = 0;
break;
}
- list_del (&list, (list_del_t*)
_mem_
free);
+ list_del (&list, (list_del_t*)
xmem
free);
return (rc);
}
return (rc);
}
@@
-1764,7
+1787,7
@@
static int check_debug (const char* option, unsigned long p,
}
#endif
}
#endif
-static int check_history (const char* option, unsigned long p,
+static int check_history (const char* option
__attribute__ ((unused))
, unsigned long p,
char* errbuf, size_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
return (0);
char* errbuf, size_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
return (0);
@@
-1777,7
+1800,7
@@
static int check_special (const char* name, unsigned long val,
int i = 0;
for (i = 0; SpecialVars[i].name; i++) {
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));
}
return (SpecialVars[i].check (SpecialVars[i].name,
val, errbuf, errlen));
}
@@
-1796,8
+1819,7
@@
static const struct mapping_t* get_sortmap (struct option_t* option) {
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
+ map = SortKeyMethods;
break;
case DT_SORT_AUX:
map = SortAuxMethods;
break;
case DT_SORT_AUX:
map = SortAuxMethods;
@@
-1835,11
+1857,11
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
query = 1;
s->dptr++;
}
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;
}
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;
}
s->dptr += 3;
inv = !inv;
}
@@
-1870,11
+1892,11
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
}
}
}
}
- 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);
}
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) {
if (reset) {
if (query || unset || inv) {
@@
-1887,7
+1909,7
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long 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);
if (CurrentMenu == MENU_PAGER) {
snprintf (err->data, err->dsize, _("Not available in this menu."));
return (-1);
@@
-1968,13
+1990,13
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
r = -1;
break;
} else if (DTYPE (option->type) == DT_ADDR)
r = -1;
break;
} else if (DTYPE (option->type) == DT_ADDR)
-
rfc822_free_address ((ADDRESS
**) option->data);
+
address_delete ((address_t
**) option->data);
else if (DTYPE (option->type) == DT_USER)
/* to unset $user_ means remove */
hash_delete (ConfigOptions, option->option,
option, del_option);
else
else if (DTYPE (option->type) == DT_USER)
/* to unset $user_ means remove */
hash_delete (ConfigOptions, option->option,
option, del_option);
else
-
mem_free ((void *)
option->data);
+
p_delete((void **)&
option->data);
break;
}
}
break;
}
}
@@
-1985,7
+2007,7
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
break;
}
break;
}
- /* the $m
uttng
_ variables are read-only */
+ /* the $m
admutt
_ variables are read-only */
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
@@
-2079,11
+2101,11
@@
static int source_rc (const char *rcfile, BUFFER * err)
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) {
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);
if (!currentline)
continue;
mutt_convert_string (¤tline, ConfigCharset, Charset, 0);
@@
-2098,7
+2120,7
@@
static int source_rc (const char *rcfile, BUFFER * err)
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
-
mem_free
(¤tline);
+
p_delete
(¤tline);
break;
}
}
break;
}
}
@@
-2107,10
+2129,10
@@
static int source_rc (const char *rcfile, BUFFER * err)
rc = -1;
}
if (conv)
rc = -1;
}
if (conv)
-
mem_free
(¤tline);
+
p_delete
(¤tline);
}
}
-
mem_free
(&token.data);
-
mem_free
(&linebuf);
+
p_delete
(&token.data);
+
p_delete
(&linebuf);
fclose (f);
if (pid != -1)
mutt_wait_filter (pid);
fclose (f);
if (pid != -1)
mutt_wait_filter (pid);
@@
-2127,7
+2149,8
@@
static int source_rc (const char *rcfile, BUFFER * err)
#undef MAXERRS
#undef MAXERRS
-static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
+static int parse_source (BUFFER * tmp, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
char path[_POSIX_PATH_MAX];
BUFFER * err)
{
char path[_POSIX_PATH_MAX];
@@
-2139,8
+2162,8
@@
static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
return (-1);
}
return (-1);
}
-
strfcpy (path, tmp->data, sizeof (path)
);
- mutt_expand_path (path, sizeof
(path));
+
m_strcpy(path, sizeof(path), tmp->data
);
+ mutt_expand_path (path, sizeof(path));
rc += source_rc (path, err);
}
rc += source_rc (path, err);
}
@@
-2164,15
+2187,15
@@
int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
int i, r = -1;
BUFFER expn;
int i, r = -1;
BUFFER expn;
-
memset (&expn, 0, sizeof (expn)
);
+
p_clear(&expn, 1
);
expn.data = expn.dptr = line;
expn.data = expn.dptr = line;
- expn.dsize =
str_len
(line);
+ expn.dsize =
m_strlen
(line);
*err->data = 0;
debug_print (1, ("expand '%s'\n", line));
*err->data = 0;
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 */
while (*expn.dptr) {
if (*expn.dptr == '#')
break; /* rest of line is a comment */
@@
-2182,7
+2205,7
@@
int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
}
mutt_extract_token (token, &expn, 0);
for (i = 0; Commands[i].name; i++) {
}
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 (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
goto finish;
break;
@@
-2197,13
+2220,13
@@
int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
r = 0;
finish:
if (expn.destroy)
r = 0;
finish:
if (expn.destroy)
-
mem_free
(&expn.data);
+
p_delete
(&expn.data);
return (r);
}
return (r);
}
-#define NUMVARS (sizeof
(MuttVars)/sizeof
(MuttVars[0]))
-#define NUMCOMMANDS (sizeof
(Commands)/sizeof
(Commands[0]))
+#define NUMVARS (sizeof
(MuttVars)/sizeof
(MuttVars[0]))
+#define NUMCOMMANDS (sizeof
(Commands)/sizeof
(Commands[0]))
/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
@@
-2226,7
+2249,7
@@
static void candidate (char *dest, char *try, const char *src, int len)
if (strstr (src, try) == src) {
Matches[Num_matched++] = src;
if (dest[0] == 0)
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;
else {
for (l = 0; src[l] && src[l] == dest[l]; l++);
dest[l] = 0;
@@
-2240,7
+2263,7
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
int num;
int spaces; /* keep track of the number of leading spaces on the line */
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;
spaces = buffer - pt;
pt = buffer + pos - spaces;
@@
-2251,12
+2274,12
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
-
strfcpy (User_typed, pt, sizeof (User_typed)
);
-
memset (Matches, 0, sizeof
(Matches));
-
memset (Completed, 0, sizeof
(Completed));
+
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++)
candidate (Completed, User_typed, Commands[num].name,
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
- sizeof
(Completed));
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
@@
-2271,27
+2294,27
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof
(Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof
(Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
/* return the completed command */
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, ...) */
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++) {
for (num = 0; prefixes[num]; num++) {
- if (!
str_ncmp (pt, prefixes[num], str_len
(prefixes[num]))) {
- pt +=
str_len
(prefixes[num]);
+ if (!
m_strncmp(pt, prefixes[num], m_strlen
(prefixes[num]))) {
+ pt +=
m_strlen
(prefixes[num]);
break;
}
}
break;
}
}
@@
-2300,12
+2323,12
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
-
strfcpy (User_typed, pt, sizeof (User_typed)
);
-
memset (Matches, 0, sizeof
(Matches));
-
memset (Completed, 0, sizeof
(Completed));
+
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++)
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 ""
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
@@
-2320,15
+2343,15
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof
(Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof
(Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
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)
struct binding_t *menu = km_get_table (CurrentMenu);
if (!menu && CurrentMenu != MENU_PAGER)
@@
-2338,17
+2361,17
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
-
strfcpy (User_typed, pt, sizeof (User_typed)
);
-
memset (Matches, 0, sizeof
(Matches));
-
memset (Completed, 0, sizeof
(Completed));
+
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++)
for (num = 0; menu[num].name; num++)
- candidate (Completed, User_typed, menu[num].name, sizeof
(Completed));
+ candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
- sizeof
(Completed));
+ sizeof(Completed));
}
Matches[Num_matched++] = User_typed;
}
Matches[Num_matched++] = User_typed;
@@
-2364,13
+2387,13
@@
int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof
(Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof
(Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
Matches[(numtabs - 2) % Num_matched]);
-
strncpy (pt, Completed, buffer + len - pt - spaces
);
+
m_strcpy(pt, buffer + len - pt - spaces, Completed
);
}
else
return 0;
}
else
return 0;
@@
-2387,7
+2410,7
@@
int mutt_var_value_complete (char *buffer, size_t len, int pos)
if (buffer[0] == 0)
return 0;
if (buffer[0] == 0)
return 0;
-
SKIPWS
(buffer);
+
buffer = vskipspaces
(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
spaces = buffer - pt;
pt = buffer + pos - spaces;
@@
-2397,10
+2420,10
@@
int mutt_var_value_complete (char *buffer, size_t len, int pos)
if (*pt == '=') /* abort if no var before the '=' */
return 0;
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 */
/* 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 {
if (!(option = hash_find (ConfigOptions, var)))
return 0; /* no such variable. */
else {
@@
-2414,18
+2437,18
@@
int mutt_var_value_complete (char *buffer, size_t len, int pos)
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
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);
}
else if (DTYPE (option->type) == DT_ADDR) {
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_write_address (tmp, sizeof
(tmp),
- *((
ADDRESS
**) option->data), 0);
+ rfc822_write_address (tmp, sizeof(tmp),
+ *((
address_t
**) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
}
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)
else if (DTYPE (option->type) == DT_NUM)
- snprintf (tmp, sizeof
(tmp), "%d", (*((short *) option->data)));
+ snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
else if (DTYPE (option->type) == DT_SORT) {
const struct mapping_t *map;
const char *p;
else if (DTYPE (option->type) == DT_SORT) {
const struct mapping_t *map;
const char *p;
@@
-2438,17
+2461,14
@@
int mutt_var_value_complete (char *buffer, size_t len, int pos)
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
- else
- map = SortMethods;
+ map = SortKeyMethods;
break;
default:
map = SortMethods;
break;
}
p = mutt_getnamebyvalue(*((short *) option->data) & SORT_MASK, map);
break;
default:
map = SortMethods;
break;
}
p = mutt_getnamebyvalue(*((short *) option->data) & SORT_MASK, map);
- snprintf(tmp, sizeof
(tmp), "%s%s%s",
+ snprintf(tmp, sizeof(tmp), "%s%s%s",
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
@@
-2470,22
+2490,21
@@
int mutt_var_value_complete (char *buffer, size_t len, int pos)
default:
p = "unknown";
}
default:
p = "unknown";
}
-
strfcpy (tmp, p, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), p
);
}
else if (DTYPE (option->type) == DT_BOOL)
}
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;
else
return 0;
- for (s = tmp, d = tmp2; *s && (d - tmp2) < s
izeof
(tmp2) - 2;) {
+ for (s = tmp, d = tmp2; *s && (d - tmp2) < s
sizeof
(tmp2) - 2;) {
if (*s == '\\' || *s == '"')
*d++ = '\\';
*d++ = *s++;
}
*d = '\0';
if (*s == '\\' || *s == '"')
*d++ = '\\';
*d++ = *s++;
}
*d = '\0';
-
strfcpy (tmp, pt, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), pt
);
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
@@
-2504,63
+2523,43
@@
int mutt_query_variables (LIST * queries)
BUFFER err, token;
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.data = errbuff;
- err.dsize = sizeof
(errbuff);
+ err.dsize = sizeof(errbuff);
for (p = queries; p; p = p->next) {
for (p = queries; p; p = p->next) {
- snprintf (command, sizeof
(command), "set ?%s\n", p->data);
+ snprintf (command, sizeof(command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
return 1;
}
printf ("%s\n", err.data);
}
return 1;
}
printf ("%s\n", err.data);
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
return 0;
}
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;
char errstr[SHORT_STRING];
static int mutt_execute_commands (LIST * p)
{
BUFFER err, token;
char errstr[SHORT_STRING];
-
memset (&err, 0, sizeof (err)
);
+
p_clear(&err, 1
);
err.data = errstr;
err.data = errstr;
- err.dsize = sizeof
(errstr);
-
memset (&token, 0, sizeof (token)
);
+ err.dsize = sizeof(errstr);
+
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);
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);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
return (-1);
}
}
return (-1);
}
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
return 0;
}
return 0;
}
@@
-2570,16
+2569,17
@@
void mutt_init (int skip_sys_rc, LIST * commands)
struct utsname utsname;
const char *p;
char buffer[STRING], error[STRING];
struct utsname utsname;
const char *p;
char buffer[STRING], error[STRING];
- int i, default_rc = 0, need_pause = 0;
+ int default_rc = 0, need_pause = 0;
+ unsigned int i;
BUFFER err;
BUFFER err;
-
memset (&err, 0, sizeof (err)
);
+
p_clear(&err, 1
);
err.data = error;
err.data = error;
- err.dsize = sizeof
(error);
+ err.dsize = sizeof(error);
/* use 3*sizeof(muttvars) instead of 2*sizeof()
* to have some room for $user_ vars */
/* use 3*sizeof(muttvars) instead of 2*sizeof()
* to have some room for $user_ vars */
- ConfigOptions = hash_create (sizeof
(MuttVars) * 3);
+ ConfigOptions = hash_create (sizeof(MuttVars) * 3);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
@@
-2592,24
+2592,24
@@
void mutt_init (int skip_sys_rc, LIST * commands)
/*
* XXX - use something even more difficult to predict?
*/
/*
* XXX - use something even more difficult to predict?
*/
- snprintf (AttachmentMarker, sizeof
(AttachmentMarker),
+ snprintf (AttachmentMarker, sizeof(AttachmentMarker),
"\033]9;%ld\a", (long) time (NULL));
/* 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")))
"\033]9;%ld\a", (long) time (NULL));
/* 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];
/* 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)
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 {
endpwent ();
}
else {
@@
-2619,13
+2619,13
@@
void mutt_init (int skip_sys_rc, LIST * commands)
exit (1);
}
if ((p = getenv ("USER")))
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);
}
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);
}
debug_start(Homedir);
@@
-2634,25
+2634,22
@@
void mutt_init (int skip_sys_rc, LIST * commands)
uname (&utsname);
/* some systems report the FQDN instead of just the hostname */
if ((p = strchr (utsname.nodename, '.'))) {
uname (&utsname);
/* some systems report the FQDN instead of just the hostname */
if ((p = strchr (utsname.nodename, '.'))) {
- Hostname =
str_substrdup (utsname.nodename, p
);
+ Hostname =
p_dupstr(utsname.nodename, p - 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
}
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 ("@");
+ if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
+ Fqdn = m_strdup("@");
else
else
-#endif /* DOMAIN */
- if (*DOMAIN != '@') {
- Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+ if (*buffer != '@') {
+ Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
}
else
}
else
- Fqdn =
str_dup
(NONULL (Hostname));
+ Fqdn =
m_strdup
(NONULL (Hostname));
#ifdef USE_NNTP
{
#ifdef USE_NNTP
{
@@
-2661,44
+2658,43
@@
void mutt_init (int skip_sys_rc, LIST * commands)
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
- fgets (buffer, sizeof (buffer), f);
- p = buffer;
- SKIPWS (p);
+ fgets (buffer, sizeof(buffer), f);
+ p = vskipspaces(buffer);
q = (char*)p;
while (*q && !isspace(*q))
q++;
*q = '\0';
q = (char*)p;
while (*q && !isspace(*q))
q++;
*q = '\0';
- NewsServer =
str_dup
(p);
+ NewsServer =
m_strdup
(p);
fclose (f);
}
}
if ((p = getenv ("NNTPSERVER")))
fclose (f);
}
}
if ((p = getenv ("NNTPSERVER")))
- NewsServer =
str_dup
(p);
+ NewsServer =
m_strdup
(p);
#endif
if ((p = getenv ("MAIL")))
#endif
if ((p = getenv ("MAIL")))
- Spoolfile =
str_dup
(p);
+ Spoolfile =
m_strdup
(p);
else if ((p = getenv ("MAILDIR")))
else if ((p = getenv ("MAILDIR")))
- Spoolfile =
str_dup
(p);
+ Spoolfile =
m_strdup
(p);
else {
#ifdef HOMESPOOL
else {
#ifdef HOMESPOOL
- mutt_concat_path
(buffer, NONULL (Homedir), MAILPATH, sizeof (buffer)
);
+ mutt_concat_path
(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH
);
#else
#else
- mutt_concat_path
(buffer, MAILPATH, NONULL (Username), sizeof (buffer
));
+ mutt_concat_path
(buffer, sizeof(buffer), MAILPATH, NONULL(Username
));
#endif
#endif
- Spoolfile =
str_dup
(buffer);
+ Spoolfile =
m_strdup
(buffer);
}
if ((p = getenv ("MAILCAPS")))
}
if ((p = getenv ("MAILCAPS")))
- MailcapPath =
str_dup
(p);
+ MailcapPath =
m_strdup
(p);
else {
/* Default search path from RFC1524 */
MailcapPath =
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");
}
"/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) {
p = getenv ("VISUAL");
if (!p) {
@@
-2706,21
+2702,20
@@
void mutt_init (int skip_sys_rc, LIST * commands)
if (!p)
p = "vi";
}
if (!p)
p = "vi";
}
- Editor = str_dup (p);
- Visual = str_dup (p);
+ Editor = m_strdup(p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
- snprintf (buffer, sizeof
(buffer), "Reply-To: %s", p);
+ snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
-
memset (&buf, 0, sizeof (buf)
);
+
p_clear(&buf, 1
);
buf.data = buf.dptr = buffer;
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);
parse_my_hdr (&token, &buf, 0, &err);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
}
if ((p = getenv ("EMAIL")) != NULL)
}
if ((p = getenv ("EMAIL")) != NULL)
@@
-2736,14
+2731,11
@@
void mutt_init (int skip_sys_rc, LIST * commands)
CurrentMenu = MENU_MAIN;
CurrentMenu = MENU_MAIN;
-
-#ifndef LOCALES_HACK
/* Do we have a locale definition? */
if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
((p = getenv ("LANG")) != NULL && p[0]) ||
((p = getenv ("LC_CTYPE")) != NULL && p[0]))
set_option (OPTLOCALES);
/* Do we have a locale definition? */
if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
((p = getenv ("LANG")) != NULL && p[0]) ||
((p = getenv ("LC_CTYPE")) != NULL && p[0]))
set_option (OPTLOCALES);
-#endif
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
@@
-2771,44
+2763,44
@@
void mutt_init (int skip_sys_rc, LIST * commands)
if (!Muttrc) {
#if 0
if (!Muttrc) {
#if 0
- snprintf (buffer, sizeof
(buffer), "%s/.muttng
rc-%s", NONULL (Homedir),
+ snprintf (buffer, sizeof
(buffer), "%s/.madmutt
rc-%s", NONULL (Homedir),
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof
(buffer), "%s/.muttng
rc", NONULL (Homedir));
+ snprintf (buffer, sizeof
(buffer), "%s/.madmutt
rc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
#if 0
if (access (buffer, F_OK) == -1)
#if 0
- snprintf (buffer, sizeof
(buffer), "%s/.muttng/muttng
rc-%s",
+ snprintf (buffer, sizeof
(buffer), "%s/.madmutt/madmutt
rc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof
(buffer), "%s/.muttng/muttng
rc",
+ snprintf (buffer, sizeof
(buffer), "%s/.madmutt/madmutt
rc",
NONULL (Homedir));
default_rc = 1;
NONULL (Homedir));
default_rc = 1;
- Muttrc =
str_dup
(buffer);
+ Muttrc =
m_strdup
(buffer);
}
else {
}
else {
-
strfcpy (buffer, Muttrc, sizeof (buffer)
);
-
mem_free
(&Muttrc);
- mutt_expand_path (buffer, sizeof
(buffer));
- Muttrc =
str_dup
(buffer);
+
m_strcpy(buffer, sizeof(buffer), Muttrc
);
+
p_delete
(&Muttrc);
+ mutt_expand_path (buffer, sizeof(buffer));
+ Muttrc =
m_strdup
(buffer);
}
}
-
mem_free
(&AliasFile);
- AliasFile =
str_dup
(NONULL (Muttrc));
+
p_delete
(&AliasFile);
+ AliasFile =
m_strdup
(NONULL (Muttrc));
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
- snprintf (buffer, sizeof
(buffer), "%s/Muttng
rc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof
(buffer), "%s/Madmutt
rc-%s", SYSCONFDIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof
(buffer), "%s/Muttng
rc", SYSCONFDIR);
+ snprintf (buffer, sizeof
(buffer), "%s/Madmutt
rc", SYSCONFDIR);
if (access (buffer, F_OK) == -1)
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof
(buffer), "%s/Muttng
rc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof
(buffer), "%s/Madmutt
rc-%s", PKGDATADIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof
(buffer), "%s/Muttng
rc", PKGDATADIR);
+ snprintf (buffer, sizeof
(buffer), "%s/Madmutt
rc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
@@
-2830,7
+2822,7
@@
void mutt_init (int skip_sys_rc, LIST * commands)
}
else if (!default_rc) {
/* file specified by -F does not exist */
}
else if (!default_rc) {
/* file specified by -F does not exist */
- snprintf (buffer, sizeof
(buffer), "%s: %s", Muttrc, strerror (errno));
+ snprintf (buffer, sizeof(buffer), "%s: %s", Muttrc, strerror (errno));
mutt_endwin (buffer);
exit (1);
}
mutt_endwin (buffer);
exit (1);
}
@@
-2840,7
+2832,7
@@
void mutt_init (int skip_sys_rc, LIST * commands)
/* warn about synonym variables */
if (!list_empty(Synonyms)) {
/* warn about synonym variables */
if (!list_empty(Synonyms)) {
- i
nt i
= 0;
+ i = 0;
fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
for (i = 0; i < Synonyms->length; i++) {
struct option_t* newopt = NULL, *oldopt = NULL;
fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
for (i = 0; i < Synonyms->length; i++) {
struct option_t* newopt = NULL, *oldopt = NULL;
@@
-2880,12
+2872,13
@@
int mutt_get_hook_type (const char *name)
/* compare two option_t*'s for sorting -t/-T output */
static int opt_cmp (const void* a, const void* b) {
/* 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));
}
/* callback for hash_map() to put all non-synonym vars into list */
(*(struct option_t**) b)->option));
}
/* callback for hash_map() to put all non-synonym vars into list */
-static void opt_sel_full (const char* key, void* data,
+static void opt_sel_full (const char* key __attribute__ ((unused)),
+ void* data,
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
@@
-2896,7
+2889,8
@@
static void opt_sel_full (const char* key, void* data,
}
/* callback for hash_map() to put all changed non-synonym vars into list */
}
/* callback for hash_map() to put all changed non-synonym vars into list */
-static void opt_sel_diff (const char* key, void* data,
+static void opt_sel_diff (const char* key __attribute__ ((unused)),
+ void* data,
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
unsigned long more) {
list2_t** l = (list2_t**) more;
struct option_t* option = (struct option_t*) data;
@@
-2905,14
+2899,14
@@
static void opt_sel_diff (const char* key, void* data,
if (DTYPE (option->type) == DT_SYN)
return;
if (DTYPE (option->type) == DT_SYN)
return;
- mutt_option_value (option->option, buf, sizeof
(buf));
- if (
str_cmp
(buf, option->init) != 0)
+ mutt_option_value (option->option, buf, sizeof(buf));
+ if (
m_strcmp
(buf, option->init) != 0)
list_push_back (l, option);
}
/* dump out the value of all the variables we have */
int mutt_dump_variables (int full) {
list_push_back (l, option);
}
/* dump out the value of all the variables we have */
int mutt_dump_variables (int full) {
-
in
t i = 0;
+
size_
t i = 0;
char outbuf[STRING];
list2_t* tmp = NULL;
struct option_t* option = NULL;
char outbuf[STRING];
list2_t* tmp = NULL;
struct option_t* option = NULL;
@@
-2923,11
+2917,11
@@
int mutt_dump_variables (int full) {
if (!list_empty(tmp)) {
/* ...and dump list sorted */
if (!list_empty(tmp)) {
/* ...and dump list sorted */
- qsort (tmp->data, tmp->length, sizeof
(void*), opt_cmp);
+ qsort (tmp->data, tmp->length, sizeof(void*), opt_cmp);
for (i = 0; i < tmp->length; i++) {
option = (struct option_t*) tmp->data[i];
FuncTable[DTYPE (option->type)].opt_to_string
for (i = 0; i < tmp->length; i++) {
option = (struct option_t*) tmp->data[i];
FuncTable[DTYPE (option->type)].opt_to_string
- (outbuf, sizeof
(outbuf), option);
+ (outbuf, sizeof(outbuf), option);
printf ("%s\n", outbuf);
}
}
printf ("%s\n", outbuf);
}
}