X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=33e64b2622d31b4e0b23f42bd39a31ccdcb1e7d2;hp=2ea4bc5b9229428c44bfc2b080166613fcc4f5e5;hb=53ceb3f257ec0af78a9129a8a565e8ca2bb03903;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1 diff --git a/account.c b/account.c index 2ea4bc5..33e64b2 100644 --- a/account.c +++ b/account.c @@ -1,31 +1,30 @@ /* + * Copyright notice from original mutt: * Copyright (C) 2000-3 Brendan Cully - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ /* remote host account manipulation (POP/IMAP) */ +#if HAVE_CONFIG_H +# include "config.h" +#endif + #include "mutt.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) */ -int mutt_account_match (const ACCOUNT* a1, const ACCOUNT* a2) +int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2) { - const char* user = NONULL (Username); + const char *user = NONULL (Username); if (a1->type != a2->type) return 0; @@ -43,24 +42,24 @@ int mutt_account_match (const ACCOUNT* a1, const ACCOUNT* a2) if (a1->type == M_ACCT_TYPE_POP && PopUser) user = PopUser; #endif - + #ifdef USE_NNTP if (a1->type == M_ACCT_TYPE_NNTP && NntpUser) user = NntpUser; #endif if (a1->flags & a2->flags & M_ACCT_USER) - return (!strcmp (a1->user, a2->user)); + return (!safe_strcmp (a1->user, a2->user)); if (a1->flags & M_ACCT_USER) - return (!strcmp (a1->user, user)); + return (!safe_strcmp (a1->user, user)); if (a2->flags & M_ACCT_USER) - return (!strcmp (a2->user, user)); + return (!safe_strcmp (a2->user, user)); return 1; } /* mutt_account_fromurl: fill account with information from url. */ -int mutt_account_fromurl (ACCOUNT* account, ciss_url_t* url) +int mutt_account_fromurl (ACCOUNT * account, ciss_url_t * url) { /* must be present */ if (url->host) @@ -68,18 +67,15 @@ int mutt_account_fromurl (ACCOUNT* account, ciss_url_t* url) else return -1; - if (url->user) - { + if (url->user) { strfcpy (account->user, url->user, sizeof (account->user)); account->flags |= M_ACCT_USER; } - if (url->pass) - { + if (url->pass) { strfcpy (account->pass, url->pass, sizeof (account->pass)); account->flags |= M_ACCT_PASS; } - if (url->port) - { + if (url->port) { account->port = url->port; account->flags |= M_ACCT_PORT; } @@ -91,7 +87,7 @@ int mutt_account_fromurl (ACCOUNT* account, ciss_url_t* url) * is a set of pointers into account - don't free or edit account until * you've finished with url (make a copy of account if you need it for * a while). */ -void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url) +void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url) { url->scheme = U_UNKNOWN; url->user = NULL; @@ -99,8 +95,7 @@ void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url) url->port = 0; #ifdef USE_IMAP - if (account->type == M_ACCT_TYPE_IMAP) - { + if (account->type == M_ACCT_TYPE_IMAP) { if (account->flags & M_ACCT_SSL) url->scheme = U_IMAPS; else @@ -109,8 +104,7 @@ void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url) #endif #ifdef USE_POP - if (account->type == M_ACCT_TYPE_POP) - { + if (account->type == M_ACCT_TYPE_POP) { if (account->flags & M_ACCT_SSL) url->scheme = U_POPS; else @@ -119,8 +113,7 @@ void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url) #endif #ifdef USE_NNTP - if (account->type == M_ACCT_TYPE_NNTP) - { + if (account->type == M_ACCT_TYPE_NNTP) { if (account->flags & M_ACCT_SSL) url->scheme = U_NNTPS; else @@ -138,7 +131,7 @@ void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url) } /* mutt_account_getuser: retrieve username into ACCOUNT, if neccessary */ -int mutt_account_getuser (ACCOUNT* account) +int mutt_account_getuser (ACCOUNT * account) { char prompt[SHORT_STRING]; @@ -158,8 +151,7 @@ int mutt_account_getuser (ACCOUNT* account) strfcpy (account->user, NntpUser, sizeof (account->user)); #endif /* prompt (defaults to unix username), copy into account->user */ - else - { + else { snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host); strfcpy (account->user, NONULL (Username), sizeof (account->user)); if (mutt_get_field (prompt, account->user, sizeof (account->user), 0)) @@ -172,7 +164,7 @@ int mutt_account_getuser (ACCOUNT* account) } /* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */ -int mutt_account_getpass (ACCOUNT* account) +int mutt_account_getpass (ACCOUNT * account) { char prompt[SHORT_STRING]; @@ -190,10 +182,9 @@ int mutt_account_getpass (ACCOUNT* account) else if ((account->type == M_ACCT_TYPE_NNTP) && NntpPass) strfcpy (account->pass, NntpPass, sizeof (account->pass)); #endif - else - { + else { snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), - account->user, account->host); + account->user, account->host); account->pass[0] = '\0'; if (mutt_get_password (prompt, account->pass, sizeof (account->pass))) return -1; @@ -204,7 +195,7 @@ int mutt_account_getpass (ACCOUNT* account) return 0; } -void mutt_account_unsetpass (ACCOUNT* account) +void mutt_account_unsetpass (ACCOUNT * account) { account->flags &= !M_ACCT_PASS; }