moparisthebest/imapfilter
1
0
Fork 0
mirror of https://github.com/moparisthebest/imapfilter synced 2024-12-21 15:18:49 -05:00
Code Issues Releases Wiki Activity

Use Lua strings for common account details

Browse Source 
Instead of using duplicates in the C structure, the Lua strings are used
directly from C for the accounts' details.
This commit is contained in:
Lefteris Chatzimparmpas 2012-02-15 22:20:19 +01:00
parent 69b4207db1
commit 14091fc7bf
3 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/request.c
View File

@ -150,15 +150,15 @@ request_login(session **ssnptr, const char *server, const char *port, const
if (!*ssnptr) {
ssn = *ssnptr = session_new();
ssn->server = xstrdup(server);
ssn->port = xstrdup(port);
ssn->username = xstrdup(user);
ssn->password = xstrdup(pass);
ssn->server = server;
ssn->port = port;
ssn->username = user;
ssn->password = pass;
if ((!strncasecmp(ssl, "tls1", 4) ||
!strncasecmp(ssl, "ssl3", 4) ||
!strncasecmp(ssl, "ssl2", 4)))
ssn->ssl = xstrdup(ssl);
ssn->ssl = ssl;
}
if (open_connection(ssn) == -1)
@ -206,7 +206,8 @@ request_login(session **ssnptr, const char *server, const char *port, const
goto fail;
if (response_authenticate(ssn, t, &in) ==
STATUS_CONTINUE) {
if ((out = auth_cram_md5(user, pass, in)) == NULL)
if ((out = auth_cram_md5(user, pass, in)) ==
NULL)
goto fail;
send_continuation(ssn, (char *)(out),
strlen((char *)(out)));
@ -218,8 +219,8 @@ request_login(session **ssnptr, const char *server, const char *port, const
}
#endif
if (r != STATUS_OK) {
t = send_request(ssn, "LOGIN \"%s\" \"%s\"", ssn->username,
ssn->password);
t = send_request(ssn, "LOGIN \"%s\" \"%s\"",
ssn->username, ssn->password);
if ((r = response_generic(ssn, t)) == -1)
goto fail;
}
@ -292,7 +293,8 @@ request_status(session *ssn, const char *mbox, unsigned int *exists, unsigned
if (ssn->protocol == PROTOCOL_IMAP4REV1) {
TRY(t = send_request(ssn,
"STATUS \"%s\" (MESSAGES RECENT UNSEEN UIDNEXT)", m));
TRY(r = response_status(ssn, t, exists, recent, unseen, uidnext));
TRY(r = response_status(ssn, t, exists, recent, unseen,
uidnext));
} else {
TRY(t = send_request(ssn, "EXAMINE \"%s\"", m));
TRY(r = response_examine(ssn, t, exists, recent));
@ -306,8 +308,7 @@ request_status(session *ssn, const char *mbox, unsigned int *exists, unsigned
* Open mailbox in read-write mode.
*/
int
request_select(session *ssn,
const char *mbox)
request_select(session *ssn, const char *mbox)
{
int t, r;
const char *m;
@ -317,11 +318,8 @@ request_select(session *ssn,
TRY(t = send_request(ssn, "SELECT \"%s\"", m));
TRY(r = response_select(ssn, t));
if (r == STATUS_OK) {
if (ssn && ssn->selected)
xfree(ssn->selected);
ssn->selected = xstrdup(m);
}
if (r == STATUS_OK)
ssn->selected = mbox;
return r;
}
@ -338,10 +336,8 @@ request_close(session *ssn)
TRY(t = send_request(ssn, "CLOSE"));
TRY(r = response_generic(ssn, t));
if (r == STATUS_OK && ssn->selected) {
xfree(ssn->selected);
if (r == STATUS_OK && ssn->selected)
ssn->selected = NULL;
}
return r;
}
@ -410,8 +406,8 @@ request_search(session *ssn, const char *criteria, const char *charset, char
int t, r;
if (charset != NULL && *charset != '\0') {
TRY(t = send_request(ssn, "UID SEARCH CHARSET \"%s\" %s", charset,
criteria));
TRY(t = send_request(ssn, "UID SEARCH CHARSET \"%s\" %s",
charset, criteria));
} else {
TRY(t = send_request(ssn, "UID SEARCH %s", criteria));
}
@ -616,7 +612,8 @@ request_copy(session *ssn, const char *mesg, const char *mbox)
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"", m));
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"",
m));
TRY(response_generic(ssn, t));
}
break;
@ -659,7 +656,8 @@ request_append(session *ssn, const char *mbox, const char *mesg, size_t
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"", m));
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"",
m));
TRY(response_generic(ssn, t));
}
break;

12
src/session.c
View File

@ -64,19 +64,7 @@ session_destroy(session *ssn)
sessions = list_remove(sessions, ssn);
if (ssn->server)
xfree(ssn->server);
if (ssn->port)
xfree(ssn->port);
if (ssn->ssl)
xfree(ssn->ssl);
if (ssn->username)
xfree(ssn->username);
if (ssn->password)
xfree(ssn->password);
if (ssn->ns.prefix)
xfree(ssn->ns.prefix);
if (ssn->selected)
xfree(ssn->selected);
xfree(ssn);
}

12
src/session.h
View File

@ -9,11 +9,11 @@
/* IMAP session. */
typedef struct session {
char *server; /* Server hostname. */
char *port; /* Server port. */
char *ssl; /* SSL protocol. */
char *username; /* User name. */
char *password; /* User password. */
const char *server; /* Server hostname. */
const char *port; /* Server port. */
const char *ssl; /* SSL protocol. */
const char *username; /* User name. */
const char *password; /* User password. */
int socket; /* Socket. */
#ifndef NO_SSLTLS
SSL *sslsocket; /* SSL socket. */
@ -25,7 +25,7 @@ typedef struct session {
char *prefix; /* Namespace prefix. */
char delim; /* Namespace delimiter. */
} ns;
char *selected; /* Selected mailbox. */
const char *selected; /* Selected mailbox. */
} session;