projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build system tweaks.
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
d4b367c
..
03150af
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-206,7
+206,7
@@
static int num_from_string (struct option_t* dst, const char* val,
num = strtol (val, &t, 0);
num = strtol (val, &t, 0);
- if (
!*val
|| *t || (short) num != num) {
+ if (
m_strisempty(val)
|| *t || (short) num != num) {
if (errbuf) {
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
val, dst->option);
if (errbuf) {
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
val, dst->option);
@@
-289,7
+289,7
@@
static int path_from_string (struct option_t* dst, const char* val,
if (!dst)
return (0);
if (!dst)
return (0);
- if (
!val || !*val
) {
+ if (
m_strisempty(val)
) {
p_delete((char**) dst->data);
return (1);
}
p_delete((char**) dst->data);
return (1);
}
@@
-423,7
+423,7
@@
static int rx_from_string (struct option_t* dst, const char* val,
p = (rx_t*) dst->data;
/* something to do? */
p = (rx_t*) dst->data;
/* something to do? */
- if (
!val || !*val
|| (p->pattern && m_strcmp(p->pattern, val) == 0))
+ if (
m_strisempty(val)
|| (p->pattern && m_strcmp(p->pattern, val) == 0))
return (1);
if (m_strcmp(dst->option, "mask") != 0)
return (1);
if (m_strcmp(dst->option, "mask") != 0)
@@
-476,7
+476,7
@@
static int magic_from_string (struct option_t* dst, const char* val,
char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
- if (!dst ||
!val || !*val
)
+ if (!dst ||
m_strisempty(val)
)
return (0);
if (ascii_strncasecmp (val, "mbox", 4) == 0)
flag = M_MBOX;
return (0);
if (ascii_strncasecmp (val, "mbox", 4) == 0)
flag = M_MBOX;
@@
-621,7
+621,7
@@
add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
{
rx_t* rx;
{
rx_t* rx;
- if (
!s || !*s
)
+ if (
m_strisempty(s)
)
return 0;
if (rx_lookup(list, s))
return 0;
if (rx_lookup(list, s))
@@
-642,7
+642,7
@@
static int add_to_spam_list(rx_t **list, const char *pat,
{
rx_t **last, *rx;
{
rx_t **last, *rx;
- if (
!pat || !*pat
|| !templ)
+ if (
m_strisempty(pat)
|| !templ)
return 0;
if (!(rx = rx_compile (pat, REG_ICASE))) {
return 0;
if (!(rx = rx_compile (pat, REG_ICASE))) {
@@
-1995,7
+1995,7
@@
static int source_rc (const char *rcfile, BUFFER * err)
}
p_delete(&token.data);
p_delete(&linebuf);
}
p_delete(&token.data);
p_delete(&linebuf);
-
fclose (
f);
+
m_fclose(&
f);
if (pid != -1)
mutt_wait_filter (pid);
if (rc) {
if (pid != -1)
mutt_wait_filter (pid);
if (rc) {
@@
-2524,7
+2524,7
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
q++;
*q = '\0';
NewsServer = m_strdup(p);
q++;
*q = '\0';
NewsServer = m_strdup(p);
-
fclose (
f);
+
m_fclose(&
f);
}
}
if ((p = getenv ("NNTPSERVER")))
}
}
if ((p = getenv ("NNTPSERVER")))
@@
-2597,18
+2597,8
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
mutt_init_history ();
if (!Muttrc) {
mutt_init_history ();
if (!Muttrc) {
-#if 0
- snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),
- MUTT_VERSION);
- if (access (buffer, F_OK) == -1)
-#endif
snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
-#if 0
- snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc-%s",
- NONULL (Homedir), MUTT_VERSION);
- if (access (buffer, F_OK) == -1)
-#endif
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
NONULL (Homedir));
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
NONULL (Homedir));