projects
/
apps
/
madmutt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f66d0f
)
fix regression, propably due to some changes in the string API
author
Pierre Habouzit
<madcoder@debian.org>
Mon, 30 Oct 2006 11:11:32 +0000
(12:11 +0100)
committer
Pierre Habouzit
<madcoder@debian.org>
Mon, 30 Oct 2006 11:11:32 +0000
(12:11 +0100)
account.c
patch
|
blob
|
history
diff --git
a/account.c
b/account.c
index
2c1eb5c
..
8d8a847
100644
(file)
--- a/
account.c
+++ b/
account.c
@@
-147,21
+147,21
@@
int mutt_account_getuser (ACCOUNT * account)
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) &&
ImapUser && (ImapUser[0] != '\0'
))
+ else if ((account->type == M_ACCT_TYPE_IMAP) &&
m_strlen(ImapUser
))
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
- else if ((account->type == M_ACCT_TYPE_POP) &&
PopUser
)
+ else if ((account->type == M_ACCT_TYPE_POP) &&
m_strlen(PopUser)
)
strfcpy (account->user, PopUser, sizeof (account->user));
#endif
#ifdef USE_NNTP
strfcpy (account->user, PopUser, sizeof (account->user));
#endif
#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) &&
NntpUser
)
+ else if ((account->type == M_ACCT_TYPE_NNTP) &&
m_strlen(NntpUser)
)
strfcpy (account->user, NntpUser, sizeof (account->user));
#endif
/* prompt (defaults to unix username), copy into account->user */
else {
snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host);
strfcpy (account->user, NntpUser, sizeof (account->user));
#endif
/* prompt (defaults to unix username), copy into account->user */
else {
snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host);
- strfcpy (account->user, NONULL
(Username), sizeof (account->user));
+ strfcpy (account->user, NONULL(Username), sizeof (account->user));
if (mutt_get_field_unbuffered (prompt, account->user,
sizeof (account->user), 0))
return -1;
if (mutt_get_field_unbuffered (prompt, account->user,
sizeof (account->user), 0))
return -1;
@@
-205,15
+205,15
@@
int mutt_account_getpass (ACCOUNT * account)
if (account->flags & M_ACCT_PASS)
return 0;
#ifdef USE_IMAP
if (account->flags & M_ACCT_PASS)
return 0;
#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) &&
ImapPass
)
+ else if ((account->type == M_ACCT_TYPE_IMAP) &&
m_strlen(ImapPass)
)
strfcpy (account->pass, ImapPass, sizeof (account->pass));
#endif
#ifdef USE_POP
strfcpy (account->pass, ImapPass, sizeof (account->pass));
#endif
#ifdef USE_POP
- else if ((account->type == M_ACCT_TYPE_POP) &&
PopPass
)
+ else if ((account->type == M_ACCT_TYPE_POP) &&
m_strlen(PopPass)
)
strfcpy (account->pass, PopPass, sizeof (account->pass));
#endif
#ifdef USE_NNTP
strfcpy (account->pass, PopPass, sizeof (account->pass));
#endif
#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) &&
NntpPass
)
+ else if ((account->type == M_ACCT_TYPE_NNTP) &&
m_strlen(NntpPass)
)
strfcpy (account->pass, NntpPass, sizeof (account->pass));
#endif
else {
strfcpy (account->pass, NntpPass, sizeof (account->pass));
#endif
else {