--- imapfilter/account.c 2004/02/13 23:44:50 1.11 +++ imapfilter/account.c 2004/02/14 19:14:43 1.12 @@ -68,7 +68,7 @@ init_account(a); strncat(a->key, line + m[1].rm_so, min(m[1].rm_eo - m[1].rm_so, - KEY_LEN - 1)); + KEY_LEN - 1)); debug("account: '%s'\n", a->key); @@ -99,8 +99,8 @@ } else flags |= FLAG_BLANKPASS; - strncat(a->server, line + m[6].rm_so, - min(m[6].rm_eo - m[6].rm_so, SERVER_LEN - 1)); + strncat(a->server, line + m[6].rm_so, min(m[6].rm_eo - m[6].rm_so, + SERVER_LEN - 1)); debug("server: '%s'\n", a->server); @@ -140,8 +140,7 @@ for (a = accounts; a != NULL; a = a->next) if (a->pass_attr == PASS_ATTR_NONE && - !strcmp(a->server, serv) && - !strcmp(a->user, user)) { + !strcmp(a->server, serv) && !strcmp(a->user, user)) { a->pass_attr = PASS_ATTR_CRYPT; return a->pass; } @@ -183,12 +182,12 @@ init_mboxgrp(g); strncat(g->key, line + m[1].rm_so, min(m[1].rm_eo - m[1].rm_so, - KEY_LEN - 1)); + KEY_LEN - 1)); debug("folder: '%s'\n", g->key); strncat(mboxs, line + m[2].rm_so, min(m[2].rm_eo - m[2].rm_so, - LINE_MAX - 1)); + LINE_MAX - 1)); process_mboxgrp(g, mboxs); @@ -199,8 +198,8 @@ /* - * Calls set_mbox() in order to create mailboxes that are part of - * the mailbox-group. + * Calls set_mbox() in order to create mailboxes that are part of the + * mailbox-group. */ void process_mboxgrp(mboxgrp_t * g, char *mboxs) @@ -290,7 +289,7 @@ hex[2] = '\0'; if (!isprint((unsigned char)(*str = (char)strtoul(hex, - NULL, 16)))) + NULL, 16)))) return ERROR_PARSER; str++;