int flag = -1;
if (!dst)
- return (0);
+ return 0;
if (ascii_strncasecmp (val, "yes", 3) == 0)
flag = 1;
else if (ascii_strncasecmp (val, "no", 2) == 0)
flag = 0;
if (flag < 0)
- return (0);
+ return 0;
if (flag)
set_option (dst->data);
else
unset_option (dst->data);
- return (1);
+ return 1;
}
static void num_to_string (char* dst, ssize_t dstlen,
char* t = NULL;
if (!dst)
- return (0);
+ return 0;
num = strtol (val, &t, 0);
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
val, dst->option);
}
- return (0);
+ return 0;
}
/* just temporarily accept new val so that check_special for
if (!check_special (dst->option, (unsigned long) num, errbuf, errlen)) {
*((short*) dst->data) = old;
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
static void str_to_string (char* dst, ssize_t dstlen,
char path[_POSIX_PATH_MAX];
if (!dst)
- return (0);
+ return 0;
if (m_strisempty(val)) {
p_delete((char**) dst->data);
- return (1);
+ return 1;
}
path[0] = '\0';
m_strcpy(path, sizeof(path), val);
mutt_expand_path (path, sizeof(path));
m_strreplace((char **) dst->data, path);
- return (1);
+ return 1;
}
static int str_from_string (struct option_t* dst, const char* val,
char* errbuf, ssize_t errlen) {
if (!dst)
- return (0);
+ return 0;
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
- return (0);
+ return 0;
m_strreplace((char**) dst->data, val);
- return (1);
+ return 1;
}
static void quad_to_string (char* dst, ssize_t dstlen,
int flag = -1;
if (!dst)
- return (0);
+ return 0;
if (ascii_strncasecmp (val, "yes", 3) == 0)
flag = M_YES;
else if (ascii_strncasecmp (val, "no", 2) == 0)
flag = M_ASKNO;
if (flag < 0)
- return (0);
+ return 0;
set_quadoption (dst->data, flag);
- return (1);
+ return 1;
}
static void sort_to_string (char* dst, ssize_t dstlen,
if (errbuf)
snprintf (errbuf, errlen, _("%s: Unknown type."),
dst->option);
- return (0);
+ return 0;
}
if (parse_sort (dst, val, map, errbuf, errlen) == -1)
- return (0);
- return (1);
+ return 0;
+ return 1;
}
static void rx_to_string (char* dst, ssize_t dstlen,
char* s = NULL;
if (!dst)
- return (0);
+ return 0;
if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
if (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
- return (0);
+ return 0;
}
if (!((rx_t*) dst->data))
/* something to do? */
if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
- return (1);
+ return 1;
if (m_strcmp(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
regerror (e, rx, errbuf, errlen);
regfree (rx);
p_delete(&rx);
- return (0);
+ return 0;
}
if (p->rx) {
if (m_strcmp(dst->option, "reply_regexp") == 0)
mutt_adjust_all_subjects ();
- return (1);
-}
-
-static void magic_to_string (char* dst, ssize_t dstlen,
- struct option_t* option) {
- const char* s = NULL;
- switch (option->data) {
- case M_MBOX: s = "mbox"; break;
- case M_MH: s = "MH"; break;
- case M_MAILDIR: s = "Maildir"; break;
- default: s = "unknown"; break;
- }
- snprintf (dst, dstlen, "%s=%s", option->option, s);
-}
-
-static int magic_from_string (struct option_t* dst, const char* val,
- char *errbuf, ssize_t errlen)
-{
- int flag = -1;
-
- if (!dst || m_strisempty(val))
- return (0);
- if (ascii_strncasecmp (val, "mbox", 4) == 0)
- flag = M_MBOX;
- else if (ascii_strncasecmp (val, "mh", 2) == 0)
- flag = M_MH;
- else if (ascii_strncasecmp (val, "maildir", 7) == 0)
- flag = M_MAILDIR;
-
- if (flag < 0)
- return (0);
-
- *((short*) dst->data) = flag;
- return (1);
-
+ return 1;
}
static struct {
{ DT_QUAD, quad_to_string, quad_from_string },
{ DT_SORT, sort_to_string, sort_from_string },
{ DT_RX, rx_to_string, rx_from_string },
- { DT_MAGIC, magic_to_string, magic_from_string },
};
if (!(option = hash_find (ConfigOptions, val))) {
*dst = '\0';
- return (0);
+ return 0;
}
tmp = p_new(char, dstlen+1);
FuncTable[DTYPE(option->type)].opt_tostr (tmp, dstlen, option);
memcpy (dst, t, l+1);
p_delete(&tmp);
- return (1);
+ return 1;
}
static void toggle_quadoption (int opt)
switch (v) {
case M_YES:
case M_NO:
- return (v);
+ return v;
default:
- v = mutt_yesorno(prompt, (v == M_ASKYES));
- CLEARLINE(main_w, LINES - 1);
- return (v);
+ return mutt_yesorno(prompt, (v == M_ASKYES));
}
}
switch (v) {
case M_YES:
case M_NO:
- return (v);
+ return v;
default:
- v = mutt_yesorno (prompt, (v == M_ASKYES));
- CLEARLINE(main_w, LINES - 1);
- return (v);
+ return mutt_yesorno(prompt, (v == M_ASKYES));
}
-
- /* not reached */
}
/* always wise to do what someone else did before */
if (!MoreArgs (s)) {
m_strcpy(err->data, err->dsize, _("alias: no address"));
- return (-1);
+ return -1;
}
mutt_extract_token (buf, s, 0);
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
m_strcpy(err->data, err->dsize, _("invalid header field"));
- return (-1);
+ return -1;
}
keylen = p - buf->data + 1;
if ((i = mutt_getvaluebyname (s, map)) == -1) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), s, dst->option);
- return (-1);
+ return -1;
}
*((short*) dst->data) = i | flags;
return;
mutt_option_value(ptr->option, buf, sizeof(buf));
- if (m_strlen(ptr->init) == 0 && buf && *buf)
+ if (m_strlen(ptr->init) == 0 && *buf)
ptr->init = m_strdup(buf);
}
} else
/* for non-string: take value as is */
*dst = m_strdup(src->init);
- return (1);
+ return 1;
}
/* if additional data more == 1, we want to resolve synonyms */
if ((int) p < 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
char* errbuf, ssize_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
- return (0);
+ return 0;
mutt_init_history ();
- return (1);
+ return 1;
}
static int check_special (const char* name, unsigned long val,
val, errbuf, errlen));
}
}
- return (1);
+ return 1;
}
static const struct mapping_t* get_sortmap (struct option_t* option) {
map = SortMethods;
break;
}
- return (map);
+ return map;
}
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
option = hash_find(ConfigOptions, tmp->data);
if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
- return (-1);
+ return -1;
}
s->dptr = vskipspaces(s->dptr);
if (reset) {
if (query || unset || inv) {
snprintf (err->data, err->dsize, _("prefix is illegal with reset"));
- return (-1);
+ return -1;
}
if (s && *s->dptr == '=') {
snprintf (err->data, err->dsize, _("value is illegal with reset"));
- return (-1);
+ return -1;
}
if (!m_strcmp("all", tmp->data)) {
if (CurrentMenu == MENU_PAGER) {
snprintf (err->data, err->dsize, _("Not available in this menu."));
- return (-1);
+ return -1;
}
hash_map (ConfigOptions, mutt_restore_default, 1);
set_option (OPTFORCEREDRAWINDEX);
set_option (OPTNEEDRESORT);
set_option (OPTRESORTINIT);
set_option (OPTREDRAWTREE);
- return (0);
+ return 0;
} else {
mutt_restore_default (NULL, option, 1);
}
if (s && *s->dptr == '=') {
if (unset || inv || query) {
snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
- return (-1);
+ return -1;
}
s->dptr++;
unset = 1;
else {
snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
- return (-1);
+ return -1;
}
}
}
else if (DTYPE (option->type) == DT_STR ||
DTYPE (option->type) == DT_PATH ||
- DTYPE (option->type) == DT_MAGIC ||
DTYPE (option->type) == DT_NUM ||
DTYPE (option->type) == DT_SORT ||
DTYPE (option->type) == DT_RX)
set_option (OPTRESORTINIT);
set_option (OPTREDRAWTREE);
}
- return (r);
+ return r;
}
#define MAXERRS 128
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
- return (-1);
+ return -1;
}
p_clear(&token, 1);
rcfile);
rc = -1;
}
- return (rc);
+ return rc;
}
#undef MAXERRS
do {
if (mutt_extract_token (tmp, s, 0) != 0) {
snprintf (err->data, err->dsize, _("source: error at %s"), s->dptr);
- return (-1);
+ return -1;
}
m_strcpy(path, sizeof(path), tmp->data);
}
while (MoreArgs (s));
- return ((rc < 0) ? -1 : 0);
+ return (rc < 0) ? -1 : 0;
}
/* line command to execute
finish:
if (expn.destroy)
p_delete(&expn.data);
- return (r);
+ return r;
}
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
- else if (DTYPE (option->type) == DT_MAGIC) {
- const char *p;
- switch (DefaultMagic) {
- case M_MBOX:
- p = "mbox";
- break;
- case M_MH:
- p = "MH";
- break;
- case M_MAILDIR:
- p = "Maildir";
- break;
- default:
- p = "unknown";
- }
- m_strcpy(tmp, sizeof(tmp), p);
- }
else if (DTYPE (option->type) == DT_BOOL)
m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
else
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
p_delete(&token.data);
- return (-1);
+ return -1;
}
}
p_delete(&token.data);
Realname = m_strdup(rnbuf);
}
-#ifdef USE_NNTP
- {
- FILE *f;
- char *q;
-
- if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
- buffer[0] = '\0';
- fgets (buffer, sizeof(buffer), f);
- p = vskipspaces(buffer);
- q = (char*)p;
- while (*q && !isspace(*q))
- q++;
- *q = '\0';
- NewsServer = m_strdup(p);
- m_fclose(&f);
- }
- }
- if ((p = getenv ("NNTPSERVER")))
- NewsServer = m_strdup(p);
-#endif
-
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
}
}
-int mutt_get_hook_type (const char *name)
-{
- struct command_t *c;
-
- for (c = Commands; c->name; c++)
- if (c->func == mutt_parse_hook && ascii_strcasecmp (c->name, name) == 0)
- return c->data;
- return 0;
-}
-