# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "enter.h"
#include "account.h"
#include "url.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
/* mutt_account_match: compare account info (host/port/user/login) */
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
#ifdef USE_IMAP
if (a1->type == M_ACCT_TYPE_IMAP) {
- if (ImapUser)
+ if (ImapUser && (ImapUser[0] != '\0'))
user = ImapUser;
- if (ImapLogin)
+ if (ImapLogin && (ImapLogin[0] != '\0'))
login = ImapLogin;
}
#endif
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser)
+ else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser && (ImapUser[0] != '\0'))
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
#ifdef USE_IMAP
else if (account->type == M_ACCT_TYPE_IMAP)
{
- if (ImapLogin) {
+ if (ImapLogin && (ImapLogin[0] != '\0')) {
strfcpy (account->login, ImapLogin, sizeof (account->login));
account->flags |= M_ACCT_LOGIN;
}