X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=afe5c9ecd5d7f7e78b2f028c007cc4d502e72b16;hp=2b5494f799cc202908935818a9d2f927b3bbade3;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=93f817273e1c70071cd5471594600bc70f12f0ff diff --git a/nntp/nntp.c b/nntp/nntp.c index 2b5494f..afe5c9e 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -9,36 +9,61 @@ * please see the file GPL in the top level source directory. */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include + +#include +#include +#include +#include #include "mutt.h" -#include "mutt_curses.h" #include "sort.h" -#include "mx.h" -#include "mx_nntp.h" -#include "mime.h" -#include "rfc1524.h" -#include "rfc2047.h" #include "nntp.h" +#include "buffy.h" -#include "mutt_crypt.h" +#include -#include "lib/mem.h" -#include "lib/str.h" -#include "lib/intl.h" -#include "lib/debug.h" - -#include -#include -#include -#include +#define WANT_LISTGROUP_COMMAND 0 static unsigned int _checked = 0; -static void nntp_error (const char *where, const char *msg) { - debug_print (1, ("unexpected response in %s: %s\n", where, msg)); +void nntp_sync_sidebar (NNTP_DATA* data) { + int i = 0; + BUFFY* tmp = NULL; + char buf[STRING]; + + if (!Incoming.len) + return; + + /* unfortunately, NNTP_DATA::group only is the plain + * group name, so for every single update, we need to + * compose the full string which must be defined via + * mailboxes command ;-((( FIXME + */ + buf[0] = '\0'; + snprintf (buf, sizeof (buf), "nntp%s://%s%s%s%s/%s", + (data->nserv->conn->account.flags & M_ACCT_SSL) ? "s" : "", + NONULL (data->nserv->conn->account.user), + *data->nserv->conn->account.pass ? ":" : "", + *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "", + data->nserv->conn->account.host, + data->group); + + /* bail out if group not found via mailboxes */ + if ((i = buffy_lookup (buf)) < 0) + return; + + tmp = Incoming.arr[i]; + /* copied from browser.c */ + if (option (OPTMARKOLD) && + data->lastCached >= data->firstMessage && + data->lastCached <= data->lastMessage) + tmp->msg_unread = data->lastMessage - data->lastCached; + else + tmp->msg_unread = data->unread; + tmp->new = data->unread > 0; + /* this is closest to a "total" count we can get */ + tmp->msgcount = data->lastMessage - data->firstMessage; } static int nntp_auth (NNTP_SERVER * serv) @@ -62,19 +87,14 @@ static int nntp_auth (NNTP_SERVER * serv) return -1; } -#ifdef DEBUG - /* don't print the password unless we're at the ungodly debugging level */ - if (DebugLevel < M_SOCK_LOG_FULL) - debug_print (M_SOCK_LOG_CMD, ("> AUTHINFO PASS *\n")); -#endif snprintf (buf, sizeof (buf), "AUTHINFO PASS %s\r\n", conn->account.pass); - mutt_socket_write_d (conn, buf, M_SOCK_LOG_FULL); + mutt_socket_write(conn, buf); if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) { conn->account.flags = flags; return -1; } - if (safe_strncmp ("281", buf, 3)) { + if (m_strncmp("281", buf, 3)) { conn->account.flags = flags; mutt_error _("Login failed."); @@ -109,14 +129,14 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv) if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); - if (!safe_strncmp ("200", buf, 3)) + if (!m_strncmp("200", buf, 3)) mutt_message (_("Connected to %s. Posting ok."), conn->account.host); - else if (!safe_strncmp ("201", buf, 3)) + else if (!m_strncmp("201", buf, 3)) mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host); else { - mutt_socket_close (conn); - str_skip_trailws (buf); - mutt_error ("%s", buf); + mutt_socket_close(conn); + m_strrtrim(buf); + mutt_error("%s", buf); sleep (2); return -1; } @@ -133,7 +153,7 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv) if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); - if (!(conn->account.flags & M_ACCT_USER) && safe_strncmp ("480", buf, 3)) { + if (!(conn->account.flags & M_ACCT_USER) && m_strncmp("480", buf, 3)) { serv->status = NNTP_OK; return 0; } @@ -162,31 +182,33 @@ static int nntp_attempt_features (NNTP_SERVER * serv) char buf[LONG_STRING]; CONNECTION *conn = serv->conn; - mutt_socket_write (conn, "LISTGROUP\r\n"); - if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) - return (nntp_connect_error (serv)); - if (safe_strncmp ("500", buf, 3)) - serv->hasLISTGROUP = 1; - mutt_socket_write (conn, "XOVER\r\n"); if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); - if (safe_strncmp ("500", buf, 3)) + if (m_strncmp("500", buf, 3)) serv->hasXOVER = 1; mutt_socket_write (conn, "XPAT\r\n"); if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); - if (safe_strncmp ("500", buf, 3)) + if (m_strncmp("500", buf, 3)) serv->hasXPAT = 1; +#if WANT_LISTGROUP_COMMAND + mutt_socket_write (conn, "LISTGROUP\r\n"); + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) + return (nntp_connect_error (serv)); + if (m_strncmp("500", buf, 3)) + serv->hasLISTGROUP = 1; +#endif + mutt_socket_write (conn, "XGTITLE +\r\n"); if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); - if (safe_strncmp ("500", buf, 3)) + if (m_strncmp("500", buf, 3)) serv->hasXGTITLE = 1; - if (!safe_strncmp ("282", buf, 3)) { + if (!m_strncmp("282", buf, 3)) { do { if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); @@ -211,11 +233,11 @@ static int nntp_open_connection (NNTP_SERVER * serv) static int nntp_reconnect (NNTP_SERVER * serv) { - char buf[SHORT_STRING]; + char buf[STRING]; mutt_socket_close (serv->conn); - FOREVER { + for (;;) { if (nntp_connect_and_auth (serv) == 0) return 0; @@ -260,11 +282,11 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen) if (*line) done = FALSE; } - else if ((!safe_strncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0) + else if ((!m_strncmp("480", buf, 3)) && nntp_auth (data->nserv) < 0) return -1; } while (!done); - strfcpy (line, buf, linelen); + m_strcpy(line, linelen, buf); return 0; } @@ -278,19 +300,20 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen) * -2 - invalid command or execution error, * -3 - error in funct(*line, *data). */ -static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg, - int (*funct) (char *, void *), void *data, - int tagged) +static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg, + progress_t* bar, int (*funct) (char *, void *), + void *data, int tagged) { char buf[LONG_STRING]; char *inbuf, *p; int done = FALSE; int chunk, line; + long pos = 0; size_t lenbuf = 0; int ret; do { - strfcpy (buf, query, sizeof (buf)); + m_strcpy(buf, sizeof(buf), query); if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) return -1; if (buf[0] == '5') @@ -300,11 +323,10 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg, ret = 0; line = 0; - inbuf = safe_malloc (sizeof (buf)); + inbuf = p_new(char, sizeof(buf)); - FOREVER { - chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn, - M_SOCK_LOG_HDR); + for (;;) { + chunk = mutt_socket_readln(buf, sizeof (buf), nntp_data->nserv->conn); if (chunk < 0) break; @@ -318,18 +340,23 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg, p++; } - strfcpy (inbuf + lenbuf, p, sizeof (buf)); + m_strcpy(inbuf + lenbuf, sizeof(buf), p); + pos += chunk; - if (chunk >= sizeof (buf)) { - lenbuf += safe_strlen (p); + if (chunk >= ssizeof (buf)) { + lenbuf += m_strlen(p); } else { - line++; - if (msg && ReadInc && (line % ReadInc == 0)) { - if (tagged) - mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line); - else - mutt_message ("%s %d", msg, line); + if (bar) { + mutt_progress_bar (bar, pos); + } else if (msg) { + line++; + if (ReadInc && (line % ReadInc == 0)) { + if (tagged) + mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line); + else + mutt_message ("%s %d", msg, line); + } } if (ret == 0 && funct (inbuf, data) < 0) @@ -337,9 +364,9 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg, lenbuf = 0; } - safe_realloc (&inbuf, lenbuf + sizeof (buf)); + p_realloc(&inbuf, lenbuf + sizeof (buf)); } - FREE (&inbuf); + p_delete(&inbuf); funct (NULL, data); } while (!done); @@ -387,8 +414,8 @@ static void nntp_parse_xref (CONTEXT * ctx, char *group, char *xref, if (colon) { *colon = '\0'; colon++; - nntp_get_status (ctx, h, p, atoi (colon)); - if (h && h->article_num == 0 && safe_strcmp (group, b) == 0) + nntp_get_status (ctx, h, b, atoi (colon)); + if (h && h->article_num == 0 && m_strcmp(group, b) == 0) h->article_num = atoi (colon); } } @@ -410,8 +437,8 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid, int ret; HEADER *h = ctx->hdrs[ctx->msgcount]; - mutt_mktemp (tempfile); - if (!(f = safe_fopen (tempfile, "w+"))) + f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!f) return -1; if (!msgid) @@ -419,18 +446,16 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid, else snprintf (buf, sizeof (buf), "HEAD %s\r\n", msgid); - ret = mutt_nntp_fetch (nntp_data, buf, NULL, nntp_read_tempfile, f, 0); + ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0); if (ret) { - if (ret != -1) - debug_print (1, ("%s\n", buf)); - fclose (f); + m_fclose(&f); unlink (tempfile); return (ret == -1 ? -1 : 1); } h->article_num = article_num; h->env = mutt_read_rfc822_header (f, h, 0, 0); - fclose (f); + m_fclose(&f); unlink (tempfile); if (h->env->xref != NULL) @@ -458,17 +483,16 @@ static int parse_description (char *line, void *n) d++; while (*d && (*d == '\t' || *d == ' ')) d++; - debug_print (2, ("group: %s, desc: %s\n", line, d)); if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL && - safe_strcmp (d, data->desc)) { - FREE (&data->desc); - data->desc = safe_strdup (d); + m_strcmp(d, data->desc)) { + p_delete(&data->desc); + data->desc = m_strdup(d); } return 0; #undef news } -static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg) +static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar) { char buf[STRING]; @@ -479,12 +503,9 @@ static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg) if (data->nserv->hasXGTITLE) snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask); else - snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask); - if (mutt_nntp_fetch (data, buf, msg, parse_description, data->nserv, 0) != + snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask); + if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) != 0) { -#ifdef DEBUG - nntp_error ("nntp_get_desc()", buf); -#endif } } @@ -502,11 +523,11 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) char *p, *b; int x, done = 0; - hdr->env = mutt_new_envelope (); - hdr->env->newsgroups = safe_strdup (nntp_data->group); - hdr->content = mutt_new_body (); + hdr->env = envelope_new(); + hdr->env->newsgroups = m_strdup(nntp_data->group); + hdr->content = body_new(); hdr->content->type = TYPETEXT; - hdr->content->subtype = safe_strdup ("plain"); + hdr->content->subtype = m_strdup("plain"); hdr->content->encoding = ENC7BIT; hdr->content->disposition = DISPINLINE; hdr->content->length = -1; @@ -527,35 +548,31 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) nntp_get_status (ctx, hdr, NULL, hdr->article_num); break; case 1: - hdr->env->subject = safe_strdup (b); - /* Now we need to do the things which would normally be done in - * mutt_read_rfc822_header() */ - if (hdr->env->subject) { - regmatch_t pmatch[1]; - - rfc2047_decode (&hdr->env->subject); - - if (regexec (ReplyRegexp.rx, hdr->env->subject, 1, pmatch, 0) == 0) - hdr->env->real_subj = hdr->env->subject + pmatch[0].rm_eo; - else - hdr->env->real_subj = hdr->env->subject; - } + hdr->env->subject = m_strdup(b); break; case 2: - rfc822_free_address (&hdr->env->from); + address_list_wipe(&hdr->env->from); hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b); - rfc2047_decode_adrlist (hdr->env->from); + /* same as for mutt_parse_rfc822_line(): + * don't leave from info NULL if there's an invalid address (or + * whatever) in From: field; mutt would just display it as empty + * and mark mail/(esp.) news article as your own. aaargh! this + * bothered me for _years_ */ + if (!hdr->env->from) { + hdr->env->from = address_new (); + hdr->env->from->personal = m_strdup(b); + } break; case 3: hdr->date_sent = mutt_parse_date (b, hdr); hdr->received = hdr->date_sent; break; case 4: - FREE (&hdr->env->message_id); - hdr->env->message_id = safe_strdup (b); + p_delete(&hdr->env->message_id); + hdr->env->message_id = m_strdup(b); break; case 5: - mutt_free_list (&hdr->env->references); + string_list_wipe(&hdr->env->references); hdr->env->references = mutt_parse_references (b, 0); break; case 6: @@ -566,11 +583,12 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) break; case 8: if (!hdr->read) - FREE (&hdr->env->xref); + p_delete(&hdr->env->xref); b = b + 6; /* skips the "Xref: " */ - hdr->env->xref = safe_strdup (b); + hdr->env->xref = m_strdup(b); nntp_parse_xref (ctx, nntp_data->group, b, hdr); } + rfc2047_decode_envelope(hdr->env); if (!*p) return -1; b = p; @@ -588,6 +606,8 @@ typedef struct { } FETCH_CONTEXT; #define fc ((FETCH_CONTEXT *) c) + +#if WANT_LISTGROUP_COMMAND static int _nntp_fetch_numbers (unsigned int num, void *c) { if (num < fc->base || num > fc->last) @@ -601,6 +621,7 @@ static int nntp_fetch_numbers (char *line, void *c) return 0; return (_nntp_fetch_numbers ((unsigned int) atoi (line), c)); } +#endif static int add_xover_line (char *line, void *c) { @@ -613,7 +634,7 @@ static int add_xover_line (char *line, void *c) if (ctx->msgcount >= ctx->hdrmax) mx_alloc_memory (ctx); - ctx->hdrs[ctx->msgcount] = mutt_new_header (); + ctx->hdrs[ctx->msgcount] = header_new(); ctx->hdrs[ctx->msgcount]->index = ctx->msgcount; nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]); @@ -629,7 +650,7 @@ static int add_xover_line (char *line, void *c) mutt_message ("%s %d/%d", fc->msg, num, total); } else - mutt_free_header (&ctx->hdrs[ctx->msgcount]); /* skip it */ + header_delete(&ctx->hdrs[ctx->msgcount]); /* skip it */ return 0; } @@ -641,6 +662,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, { char buf[HUGE_STRING]; char *msg = _("Fetching message headers..."); + char *msg2 = _("Fetching headers from cache..."); NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data); int ret; int num; @@ -659,44 +681,34 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, fc.ctx = ctx; fc.base = first; fc.last = last; - fc.messages = safe_calloc (last - first + 1, sizeof (unsigned short)); + fc.messages = p_new(unsigned short, last - first + 1); +#if WANT_LISTGROUP_COMMAND if (nntp_data->nserv->hasLISTGROUP) { snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group); - if (mutt_nntp_fetch (nntp_data, buf, NULL, nntp_fetch_numbers, &fc, 0) != + if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) != 0) { mutt_error (_("LISTGROUP command failed: %s"), buf); sleep (2); -#ifdef DEBUG - nntp_error ("nntp_fetch_headers()", buf); -#endif - FREE (&fc.messages); + p_delete(&fc.messages); return -1; } } else { - /* mutt_nntp_query() issues a 'GROUP nntp_data->group' - * command on its own if !*buf */ - buf[0] = '\0'; - mutt_nntp_query (nntp_data, buf, sizeof (buf)); - if (sscanf (buf + 4, "%d %u %u %s", &num, &fc.first, &fc.last, buf) != 4) { - mutt_error (_("GROUP command failed: %s"), buf); - FREE (&fc.messages); - return (-1); - } - else { - for (num = fc.first; num < fc.last; num++) - _nntp_fetch_numbers (num, &fc); - } +#endif + for (num = 0; num < last - first + 1; num++) + fc.messages[num] = 1; +#if WANT_LISTGROUP_COMMAND } +#endif /* CACHE: must be loaded xover cache here */ num = nntp_data->lastCached - first + 1; if (option (OPTNEWSCACHE) && nntp_data->cache && num > 0) { nntp_cache_expand (buf, nntp_data->cache); - mutt_message _("Fetching headers from cache..."); + mutt_message (msg2); if ((f = safe_fopen (buf, "r"))) { - int r = 0; + int r = 0, c = 0; /* counting number of lines */ while (fgets (buf, sizeof (buf), f) != NULL) @@ -708,9 +720,12 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, fc.first = first; fc.last = first + num - 1; fc.msg = NULL; - while (fgets (buf, sizeof (buf), f) != NULL) + while (fgets (buf, sizeof (buf), f) != NULL) { + if (ReadInc && ((++c) % ReadInc == 0)) + mutt_message ("%s %d/%d", msg2, c, r); add_xover_line (buf, &fc); - fclose (f); + } + m_fclose(&f); nntp_data->lastLoaded = fc.last; first = fc.last + 1; if (ctx->msgcount > oldmsgcount) @@ -721,7 +736,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, } num = last - first + 1; if (num <= 0) { - FREE (&fc.messages); + p_delete(&fc.messages); return 0; } @@ -736,15 +751,12 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, fc.last = last; fc.msg = msg; snprintf (buf, sizeof (buf), "XOVER %d-%d\r\n", first, last); - ret = mutt_nntp_fetch (nntp_data, buf, NULL, add_xover_line, &fc, 0); + ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, add_xover_line, &fc, 0); if (ctx->msgcount > oldmsgcount) mx_update_context (ctx, ctx->msgcount - oldmsgcount); if (ret != 0) { mutt_error (_("XOVER command failed: %s"), buf); -#ifdef DEBUG - nntp_error ("nntp_fetch_headers()", buf); -#endif - FREE (&fc.messages); + p_delete(&fc.messages); return -1; } /* fetched OK */ @@ -761,7 +773,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, if (ctx->msgcount >= ctx->hdrmax) mx_alloc_memory (ctx); - h = ctx->hdrs[ctx->msgcount] = mutt_new_header (); + h = ctx->hdrs[ctx->msgcount] = header_new(); h->index = ctx->msgcount; ret = nntp_read_header (ctx, NULL, current); @@ -771,16 +783,16 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, mx_update_context (ctx, 1); } else - mutt_free_header (&h); /* skip it */ + header_delete(&h); /* skip it */ if (ret == -1) { - FREE (&fc.messages); + p_delete(&fc.messages); return -1; } if (current > nntp_data->lastLoaded) nntp_data->lastLoaded = current; } - FREE (&fc.messages); + p_delete(&fc.messages); nntp_data->lastLoaded = last; mutt_clear_error (); return 0; @@ -789,7 +801,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, /* * currently, nntp "mailbox" is "newsgroup" */ -int nntp_open_mailbox (CONTEXT * ctx) +static int nntp_open_mailbox (CONTEXT * ctx) { NNTP_DATA *nntp_data; NNTP_SERVER *serv; @@ -797,16 +809,18 @@ int nntp_open_mailbox (CONTEXT * ctx) char server[LONG_STRING]; int count = 0; unsigned int first; - ACCOUNT acct; + ACCOUNT act; + + p_clear(&act, 1); - if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf) { + if (nntp_parse_url (ctx->path, &act, buf, sizeof (buf)) < 0 || !*buf) { mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path); mutt_sleep (2); return -1; } server[0] = '\0'; - nntp_expand_path (server, sizeof (server), &acct); + nntp_expand_path (server, sizeof (server), &act); if (!(serv = mutt_select_newsserver (server)) || serv->status != NNTP_OK) return -1; @@ -814,7 +828,7 @@ int nntp_open_mailbox (CONTEXT * ctx) /* create NNTP-specific state struct if nof found in list */ if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) { - nntp_data = safe_calloc (1, sizeof (NNTP_DATA) + safe_strlen (buf) + 1); + nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1); nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA); strcpy (nntp_data->group, buf); hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0); @@ -826,24 +840,21 @@ int nntp_open_mailbox (CONTEXT * ctx) mutt_message (_("Selecting %s..."), nntp_data->group); if (!nntp_data->desc) { - nntp_get_desc (nntp_data, nntp_data->group, NULL); + nntp_get_desc (nntp_data, nntp_data->group, NULL, NULL); if (nntp_data->desc) nntp_save_cache_index (serv); } buf[0] = 0; if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) { -#ifdef DEBUG - nntp_error ("nntp_open_mailbox()", buf); -#endif return -1; } - if (safe_strncmp ("211", buf, 3)) { - LIST *l = serv->list; + if (m_strncmp("211", buf, 3)) { + string_list_t *l = serv->list; /* GROUP command failed */ - if (!safe_strncmp ("411", buf, 3)) { + if (!m_strncmp("411", buf, 3)) { mutt_error (_("Newsgroup %s not found on server %s"), nntp_data->group, serv->conn->account.host); @@ -886,8 +897,8 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) char buf[LONG_STRING]; char path[_POSIX_PATH_MAX]; NNTP_CACHE *cache; - char *m = _("Fetching message..."); int ret; + progress_t bar; /* see if we already have the message in our cache */ cache = @@ -901,17 +912,14 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) /* clear the previous entry */ unlink (cache->path); - free (cache->path); - - mutt_message (m); + p_delete(&cache->path); cache->index = ctx->hdrs[msgno]->index; - mutt_mktemp (path); - cache->path = safe_strdup (path); - if (!(msg->fp = safe_fopen (path, "w+"))) { - FREE (&cache->path); + msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL); + if (!msg->fp) { return -1; } + cache->path = m_strdup(path); if (ctx->hdrs[msgno]->article_num == 0) snprintf (buf, sizeof (buf), "ARTICLE %s\r\n", @@ -920,27 +928,30 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) snprintf (buf, sizeof (buf), "ARTICLE %d\r\n", ctx->hdrs[msgno]->article_num); - ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, m, nntp_read_tempfile, + bar.msg = _("Fetching message..."); + bar.size = 0; + mutt_progress_bar (&bar, 0); + + ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, NULL, &bar, nntp_read_tempfile, msg->fp, ctx->tagged); if (ret == 1) { mutt_error (_("Article %d not found on server"), ctx->hdrs[msgno]->article_num); - debug_print (1, ("%s\n", buf)); } if (ret) { - fclose (msg->fp); + m_fclose(&msg->fp); unlink (path); - FREE (&cache->path); + p_delete(&cache->path); return -1; } - mutt_free_envelope (&ctx->hdrs[msgno]->env); + envelope_delete(&ctx->hdrs[msgno]->env); ctx->hdrs[msgno]->env = mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0); /* fix content length */ - fseek (msg->fp, 0, SEEK_END); - ctx->hdrs[msgno]->content->length = ftell (msg->fp) - + fseeko (msg->fp, 0, SEEK_END); + ctx->hdrs[msgno]->content->length = ftello (msg->fp) - ctx->hdrs[msgno]->content->offset; /* this is called in mutt before the open which fetches the message, @@ -985,7 +996,7 @@ int nntp_post (const char *msg) return -1; } - strfcpy (buf, "POST\r\n", sizeof (buf)); + m_strcpy(buf, sizeof(buf), "POST\r\n"); if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) { mutt_error (_("Can't post article. Connection to %s lost."), nntp_data->nserv->conn->account.host); @@ -999,7 +1010,7 @@ int nntp_post (const char *msg) buf[0] = '.'; buf[1] = '\0'; while (fgets (buf + 1, sizeof (buf) - 2, f) != NULL) { - len = safe_strlen (buf); + len = m_strlen(buf); if (buf[len - 1] == '\n') { buf[len - 1] = '\r'; buf[len] = '\n'; @@ -1007,15 +1018,15 @@ int nntp_post (const char *msg) buf[len] = '\0'; } if (buf[1] == '.') - mutt_socket_write_d (nntp_data->nserv->conn, buf, M_SOCK_LOG_HDR); + mutt_socket_write(nntp_data->nserv->conn, buf); else - mutt_socket_write_d (nntp_data->nserv->conn, buf + 1, M_SOCK_LOG_HDR); + mutt_socket_write(nntp_data->nserv->conn, buf + 1); } - fclose (f); + m_fclose(&f); - if (buf[safe_strlen (buf) - 1] != '\n') - mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", M_SOCK_LOG_HDR); - mutt_socket_write_d (nntp_data->nserv->conn, ".\r\n", M_SOCK_LOG_HDR); + if (buf[m_strlen(buf) - 1] != '\n') + mutt_socket_write(nntp_data->nserv->conn, "\r\n"); + mutt_socket_write(nntp_data->nserv->conn, ".\r\n"); if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0) { mutt_error (_("Can't post article. Connection to %s lost."), nntp_data->nserv->conn->account.host); @@ -1034,24 +1045,20 @@ void nntp_logout_all (void) { char buf[LONG_STRING]; CONNECTION *conn; - CONNECTION *tmp; conn = mutt_socket_head (); while (conn) { - tmp = conn; - + CONNECTION* next = conn->next; if (conn->account.type == M_ACCT_TYPE_NNTP) { mutt_message (_("Closing connection to %s..."), conn->account.host); mutt_socket_write (conn, "QUIT\r\n"); mutt_socket_readln (buf, sizeof (buf), conn); mutt_clear_error (); mutt_socket_close (conn); - - mutt_socket_free (tmp); + mutt_socket_free (conn); } - - conn = conn->next; + conn = next; } } @@ -1062,25 +1069,25 @@ static void nntp_free_acache (NNTP_DATA * data) for (i = 0; i < NNTP_CACHE_LEN; i++) { if (data->acache[i].path) { unlink (data->acache[i].path); - FREE (&data->acache[i].path); + p_delete(&data->acache[i].path); } } } void nntp_delete_data (void *p) { - NNTP_DATA *data = (NNTP_DATA *) p; + NNTP_DATA *data = (NNTP_DATA *)p; if (!p) return; - FREE (&data->entries); - FREE (&data->desc); - FREE (&data->cache); + p_delete(&data->entries); + p_delete(&data->desc); + p_delete(&data->cache); nntp_free_acache (data); - FREE (p); + p_delete(&data); } -int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2) +static int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2) { NNTP_DATA *data = ctx->data; @@ -1093,7 +1100,7 @@ int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2) return 0; } -void nntp_fastclose_mailbox (CONTEXT * ctx) +static void nntp_fastclose_mailbox (CONTEXT * ctx) { NNTP_DATA *data = (NNTP_DATA *) ctx->data, *tmp; @@ -1106,6 +1113,8 @@ void nntp_fastclose_mailbox (CONTEXT * ctx) if ((tmp = hash_find (data->nserv->newsgroups, data->group)) == NULL || tmp != data) nntp_delete_data (data); + else + nntp_sync_sidebar (data); } /* commit changes and terminate connection */ @@ -1151,21 +1160,15 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data) buf[0] = 0; if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) { -#ifdef DEBUG - nntp_error ("nntp_check_mailbox()", buf); -#endif return -1; } - if (safe_strncmp ("211", buf, 3)) { + if (m_strncmp("211", buf, 3)) { buf[0] = 0; if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) { -#ifdef DEBUG - nntp_error ("nntp_check_mailbox()", buf); -#endif return -1; } } - if (!safe_strncmp ("211", buf, 3)) { + if (!m_strncmp("211", buf, 3)) { int first; int last; @@ -1184,7 +1187,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data) /* active was renumbered? */ if (last < nntp_data->lastLoaded) { if (!nntp_data->max) { - nntp_data->entries = safe_calloc (5, sizeof (NEWSRC_ENTRY)); + nntp_data->entries = p_new(NEWSRC_ENTRY, 5); nntp_data->max = 5; } nntp_data->lastCached = 0; @@ -1192,13 +1195,14 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data) nntp_data->entries[0].first = 1; nntp_data->entries[0].last = 0; } + nntp_sync_sidebar (nntp_data); } time (&nntp_data->nserv->check_time); return 0; } -int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2) +static int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2) { return _nntp_check_mailbox (ctx, (NNTP_DATA *) ctx->data); } @@ -1224,7 +1228,7 @@ static int add_group (char *buf, void *serv) return 0; if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) { n++; - nntp_data = safe_calloc (1, sizeof (NNTP_DATA) + safe_strlen (group) + 1); + nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1); nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA); strcpy (nntp_data->group, group); nntp_data->nserv = s; @@ -1241,9 +1245,9 @@ static int add_group (char *buf, void *serv) else nntp_data->allowed = 0; if (nntp_data->desc) - FREE (&nntp_data->desc); + p_delete(&nntp_data->desc); if (*desc) - nntp_data->desc = safe_strdup (desc); + nntp_data->desc = m_strdup(desc); if (nntp_data->rc || nntp_data->lastCached) mutt_newsgroup_stat (nntp_data); else if (nntp_data->lastMessage && @@ -1260,8 +1264,8 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force) { char buf[LONG_STRING]; NNTP_DATA nntp_data; - LIST *l; - LIST emp; + string_list_t *l; + string_list_t emp; time_t now; struct tm *t; @@ -1280,6 +1284,7 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force) if (l->data && ((NNTP_DATA *) l->data)->subscribed) _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data); } + sidebar_draw (); } else if (!force) return 0; @@ -1298,11 +1303,8 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force) else nntp_data.group = NULL; l = serv->tail; - if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), + if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL, add_group, serv, 0) != 0) { -#ifdef DEBUG - nntp_error ("nntp_check_newgroups()", buf); -#endif return -1; } @@ -1317,7 +1319,7 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force) l = l->next; ((NNTP_DATA *) l->data)->new = 1; nntp_get_desc ((NNTP_DATA *) l->data, ((NNTP_DATA *) l->data)->group, - NULL); + NULL, NULL); } if (emp.next) nntp_save_cache_index (serv); @@ -1342,12 +1344,12 @@ int nntp_get_cache_all (NNTP_SERVER * serv) i++; } add_group (NULL, NULL); - fclose (f); + m_fclose(&f); mutt_clear_error (); return 0; } else { - FREE (&serv->cache); + p_delete(&serv->cache); return -1; } } @@ -1355,9 +1357,9 @@ int nntp_get_cache_all (NNTP_SERVER * serv) /* Load list of all newsgroups from active */ int nntp_get_active (NNTP_SERVER * serv) { - char msg[SHORT_STRING]; + char msg[STRING]; NNTP_DATA nntp_data; - LIST *tmp; + string_list_t *tmp; if (nntp_open_connection (serv) < 0) return -1; @@ -1370,16 +1372,13 @@ int nntp_get_active (NNTP_SERVER * serv) nntp_data.nserv = serv; nntp_data.group = NULL; - if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, add_group, serv, 0) < 0) { -#ifdef DEBUG - nntp_error ("nntp_get_active()", "LIST\r\n"); -#endif + if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) { return -1; } - strfcpy (msg, _("Loading descriptions..."), sizeof (msg)); + m_strcpy(msg, sizeof(msg), _("Loading descriptions...")); mutt_message (msg); - nntp_get_desc (&nntp_data, "*", msg); + nntp_get_desc (&nntp_data, "*", msg, NULL); for (tmp = serv->list; tmp; tmp = tmp->next) { NNTP_DATA *data = (NNTP_DATA *) tmp->data; @@ -1409,7 +1408,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid) return 1; if (ctx->msgcount == ctx->hdrmax) mx_alloc_memory (ctx); - ctx->hdrs[ctx->msgcount] = mutt_new_header (); + ctx->hdrs[ctx->msgcount] = header_new(); ctx->hdrs[ctx->msgcount]->index = ctx->msgcount; mutt_message (_("Fetching %s from server..."), msgid); @@ -1417,7 +1416,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid) /* since nntp_read_header() may set read flag, we must reset it */ ctx->hdrs[ctx->msgcount]->read = 0; if (ret != 0) - mutt_free_header (&ctx->hdrs[ctx->msgcount]); + header_delete(&ctx->hdrs[ctx->msgcount]); else { ctx->msgcount++; mx_update_context (ctx, 1); @@ -1444,7 +1443,7 @@ static int check_children (char *s, void *c) if (cc->ctx->hdrs[i]->article_num == n) return 0; if (cc->num >= cc->max) - safe_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25)); + p_realloc(&cc->child, cc->max += 25); cc->child[cc->num++] = n; return 0; @@ -1475,9 +1474,9 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid) cc.ctx = ctx; cc.num = 0; cc.max = 25; - cc.child = safe_malloc (sizeof (unsigned int) * 25); - if (mutt_nntp_fetch (nntp_data, buf, NULL, check_children, &cc, 0)) { - FREE (&cc.child); + cc.child = p_new(unsigned int, 25); + if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) { + p_delete(&cc.child); return -1; } /* dont try to read the xover cache. check_children() already @@ -1497,6 +1496,39 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid) } if (tmp) set_option (OPTNEWSCACHE); - FREE (&cc.child); + p_delete(&cc.child); return ret; } + +static int nntp_is_magic (const char* path, struct stat* st) { + url_scheme_t s = url_check_scheme (NONULL (path)); + return ((s == U_NNTP || s == U_NNTPS) ? M_NNTP : -1); +} + +static int acl_check_nntp (CONTEXT* ctx, int bit) { + switch (bit) { + case ACL_INSERT: /* editing messages */ + case ACL_WRITE: /* change importance */ + return (0); + case ACL_DELETE: /* (un)deletion */ + case ACL_SEEN: /* mark as read */ + return (1); + default: + return (0); + } +} + +mx_t const nntp_mx = { + M_NNTP, + 0, + nntp_is_magic, + NULL, + NULL, + nntp_open_mailbox, + NULL, + acl_check_nntp, + nntp_check_mailbox, + nntp_fastclose_mailbox, + nntp_sync_mailbox, + NULL, +};