return i + 1;
}
+int mutt_socket_readln2(buffer_t *buf, CONNECTION *conn)
+{
+ char ch;
+
+ while (mutt_socket_readchar(conn, &ch) == 1) {
+ if (ch == '\n') {
+ if (buf->len && buf->data[buf->len - 1] == '\r') {
+ buf->data[--buf->len] = '\0';
+ }
+ return 0;
+ }
+ buffer_addch(buf, ch);
+ }
+
+ return -1;
+}
+
CONNECTION *mutt_socket_head (void)
{
return Connections;
CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
{
CONNECTION *conn;
- ciss_url_t url;
- char hook[LONG_STRING];
-
- /* account isn't actually modified, since url isn't either */
- mutt_account_tourl ((ACCOUNT *) account, &url);
- url.path = NULL;
- url_ciss_tostring (&url, hook, sizeof (hook), 0);
- mutt_account_hook (hook);
conn = start ? start->next : Connections;
while (conn) {
if (Tunnel && *Tunnel)
mutt_tunnel_socket_setup (conn);
- else if (account->flags & M_ACCT_SSL) {
+ else if (account->has_ssl) {
if (mutt_ssl_socket_setup (conn) < 0) {
mutt_socket_free (conn);
return NULL;