X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=2fc34d6c0fd4dc1bc826531d3ca8165ec8e40611;hb=4e846802eb1912873b56a27644215e6eeb91dc76;hp=32f40c6a6cda6402f2b4bba9f7a2f461826a57cd;hpb=284454918cc95058b026d057195eaa5279135c36;p=apps%2Fmadmutt.git diff --git a/nntp/nntp.c b/nntp/nntp.c index 32f40c6..2fc34d6 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -14,17 +14,13 @@ #include #include #include +#include #include "mutt.h" #include "sort.h" -#include "mx.h" -#include "mx_nntp.h" #include "nntp.h" #include "buffy.h" - -#include - -#define WANT_LISTGROUP_COMMAND 0 +#include "crypt.h" static unsigned int _checked = 0; @@ -36,19 +32,13 @@ void nntp_sync_sidebar (NNTP_DATA* data) { 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); + snprintf(buf, sizeof (buf), "nntp%s://%s%s%s%s/%s", + data->nserv->conn->account.has_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) @@ -73,8 +63,8 @@ static int nntp_auth (NNTP_SERVER * serv) char buf[STRING]; unsigned char flags = conn->account.flags; - if (mutt_account_getuser (&conn->account) || !conn->account.user[0] || - mutt_account_getpass (&conn->account) || !conn->account.pass[0]) { + if (mutt_account_getuser(&conn->account) || !conn->account.user[0] || + mutt_account_getpass(&conn->account) || !conn->account.pass[0]) { conn->account.flags = flags; return -2; } @@ -142,8 +132,6 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv) return -1; } - sleep (1); - /* Tell INN to switch to mode reader if it isn't so. Ignore all returned codes and messages. */ mutt_socket_write (conn, "MODE READER\r\n"); @@ -154,7 +142,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) && m_strncmp("480", buf, 3)) { + if (!conn->account.has_user && m_strncmp("480", buf, 3)) { serv->status = NNTP_OK; return 0; } @@ -183,6 +171,9 @@ static int nntp_attempt_features (NNTP_SERVER * serv) char buf[LONG_STRING]; CONNECTION *conn = serv->conn; + if (serv->feat_known) + return 0; + mutt_socket_write (conn, "XOVER\r\n"); if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) return nntp_connect_error (serv); @@ -195,13 +186,11 @@ static int nntp_attempt_features (NNTP_SERVER * serv) 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) @@ -216,6 +205,7 @@ static int nntp_attempt_features (NNTP_SERVER * serv) } while (!(buf[0] == '.' && buf[1] == '\0')); } + serv->feat_known = 1; return 0; } @@ -234,7 +224,7 @@ 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); @@ -301,8 +291,9 @@ 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, const char *query, char *msg, - progress_t* bar, int (*funct) (char *, void *), +static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, + const char *msg, progress_t* bar, + int (*funct) (char *, void *), void *data, int tagged) { char buf[LONG_STRING]; @@ -438,8 +429,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(mod_core.tmpdir), NULL); + if (!f) return -1; if (!msgid) @@ -449,14 +440,14 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid, ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0); if (ret) { - 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) @@ -504,7 +495,7 @@ static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progre if (data->nserv->hasXGTITLE) snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask); else - snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask); + snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask); if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) != 0) { } @@ -599,34 +590,33 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) typedef struct { CONTEXT *ctx; - unsigned int base; - unsigned int first; - unsigned int last; - unsigned short *messages; - char *msg; + int base; + int first; + int last; + char *messages; + const char *msg; } FETCH_CONTEXT; -#define fc ((FETCH_CONTEXT *) c) - -#if WANT_LISTGROUP_COMMAND -static int _nntp_fetch_numbers (unsigned int num, void *c) +static int nntp_fetch_numbers (char *line, void *c) { + int num; + FETCH_CONTEXT *fc = c; + + if (!line) + return 0; + + num = atoi(line); if (num < fc->base || num > fc->last) return 0; + fc->messages[num - fc->base] = 1; return 0; } -static int nntp_fetch_numbers (char *line, void *c) -{ - if (!line) - return 0; - return (_nntp_fetch_numbers ((unsigned int) atoi (line), c)); -} -#endif static int add_xover_line (char *line, void *c) { - unsigned int num, total; + int num, total; + FETCH_CONTEXT *fc = c; CONTEXT *ctx = fc->ctx; NNTP_DATA *data = (NNTP_DATA *) ctx->data; @@ -658,17 +648,13 @@ static int add_xover_line (char *line, void *c) #undef fc -static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, - unsigned int last) +static int nntp_fetch_headers(CONTEXT * ctx, int first, int last) { char buf[HUGE_STRING]; - char *msg = _("Fetching message headers..."); - char *msg2 = _("Fetching headers from cache..."); + const char *msg = _("Fetching message headers..."); + const char *msg2 = _("Fetching headers from cache..."); NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data); - int ret; - int num; - int oldmsgcount; - unsigned int current; + int ret, num, oldmsgcount, current; FILE *f; FETCH_CONTEXT fc; @@ -682,94 +668,91 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, fc.ctx = ctx; fc.base = first; fc.last = last; - fc.messages = p_new(unsigned short, last - first + 1); -#if WANT_LISTGROUP_COMMAND + fc.messages = p_new(char, last - first + 1); + if (nntp_data->nserv->hasLISTGROUP) { snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group); - if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) != - 0) { + if (mutt_nntp_fetch(nntp_data, buf, NULL, NULL, + nntp_fetch_numbers, &fc, 0)) + { mutt_error (_("LISTGROUP command failed: %s"), buf); sleep (2); p_delete(&fc.messages); return -1; } - } - else { -#endif + } else { 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 (msg2); - - if ((f = safe_fopen (buf, "r"))) { - int r = 0, c = 0; - - /* counting number of lines */ - while (fgets (buf, sizeof (buf), f) != NULL) - r++; - rewind (f); - while (r > num && fgets (buf, sizeof (buf), f) != NULL) - r--; - oldmsgcount = ctx->msgcount; - fc.first = first; - fc.last = first + num - 1; - fc.msg = 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); - nntp_data->lastLoaded = fc.last; - first = fc.last + 1; - if (ctx->msgcount > oldmsgcount) - mx_update_context (ctx, ctx->msgcount - oldmsgcount); - } - else - nntp_delete_cache (nntp_data); - } - num = last - first + 1; - if (num <= 0) { - p_delete(&fc.messages); - return 0; } - /* - * Without XOVER, we have to fetch each article header and parse - * it. With XOVER, we ask for all of them - */ - mutt_message (msg); - if (nntp_data->nserv->hasXOVER) { - oldmsgcount = ctx->msgcount; - fc.first = 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, 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); - p_delete(&fc.messages); - return -1; - } - /* fetched OK */ +/* 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 (msg2); + +if ((f = safe_fopen (buf, "r"))) { + int r = 0, c = 0; + + /* counting number of lines */ + while (fgets (buf, sizeof (buf), f) != NULL) + r++; + rewind (f); + while (r > num && fgets (buf, sizeof (buf), f) != NULL) + r--; + oldmsgcount = ctx->msgcount; + fc.first = first; + fc.last = first + num - 1; + fc.msg = 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); } - else - for (current = first; current <= last; current++) { - HEADER *h; + m_fclose(&f); + nntp_data->lastLoaded = fc.last; + first = fc.last + 1; + if (ctx->msgcount > oldmsgcount) + mx_update_context (ctx, ctx->msgcount - oldmsgcount); +} +else + nntp_delete_cache (nntp_data); +} +num = last - first + 1; +if (num <= 0) { +p_delete(&fc.messages); +return 0; +} - ret = current - first + 1; - mutt_message ("%s %d/%d", msg, ret, num); +/* +* Without XOVER, we have to fetch each article header and parse +* it. With XOVER, we ask for all of them +*/ +mutt_message (msg); +if (nntp_data->nserv->hasXOVER) { +oldmsgcount = ctx->msgcount; +fc.first = 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, 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); + p_delete(&fc.messages); + return -1; +} +/* fetched OK */ +} +else +for (current = first; current <= last; current++) { + HEADER *h; - if (!fc.messages[current - fc.base]) + ret = current - first + 1; + mutt_message ("%s %d/%d", msg, ret, num); + + if (!fc.messages[current - fc.base]) continue; if (ctx->msgcount >= ctx->hdrmax) @@ -802,14 +785,13 @@ 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; char buf[HUGE_STRING]; char server[LONG_STRING]; - int count = 0; - unsigned int first; + int count = 0, first; ACCOUNT act; p_clear(&act, 1); @@ -832,7 +814,7 @@ int nntp_open_mailbox (CONTEXT * ctx) 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); + hash_insert (serv->newsgroups, nntp_data->group, nntp_data); nntp_add_to_list (serv, nntp_data); } ctx->data = nntp_data; @@ -861,7 +843,7 @@ int nntp_open_mailbox (CONTEXT * ctx) /* CACHE: delete cache and line from .index */ nntp_delete_cache (nntp_data); - hash_delete (serv->newsgroups, nntp_data->group, NULL, + hash_remove (serv->newsgroups, nntp_data->group, NULL, nntp_delete_data); while (l && l->data != (void *) nntp_data) l = l->next; @@ -916,12 +898,11 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) p_delete(&cache->path); cache->index = ctx->hdrs[msgno]->index; - mutt_mktemp (path); - cache->path = m_strdup(path); - if (!(msg->fp = safe_fopen (path, "w+"))) { - p_delete(&cache->path); + msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), 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", @@ -942,7 +923,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) } if (ret) { - fclose (msg->fp); + m_fclose(&msg->fp); unlink (path); p_delete(&cache->path); return -1; @@ -1024,7 +1005,7 @@ int nntp_post (const char *msg) else mutt_socket_write(nntp_data->nserv->conn, buf + 1); } - fclose (f); + m_fclose(&f); if (buf[m_strlen(buf) - 1] != '\n') mutt_socket_write(nntp_data->nserv->conn, "\r\n"); @@ -1089,7 +1070,7 @@ void nntp_delete_data (void *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; @@ -1102,7 +1083,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; @@ -1204,7 +1185,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data) 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); } @@ -1235,8 +1216,8 @@ static int add_group (char *buf, void *serv) strcpy (nntp_data->group, group); nntp_data->nserv = s; if (s->newsgroups->nelem < s->newsgroups->curnelem * 2) - s->newsgroups = hash_resize (s->newsgroups, s->newsgroups->nelem * 2); - hash_insert (s->newsgroups, nntp_data->group, nntp_data, 0); + hash_resize (s->newsgroups, s->newsgroups->nelem * 2); + hash_insert (s->newsgroups, nntp_data->group, nntp_data); nntp_add_to_list (s, nntp_data); } nntp_data->deleted = 0; @@ -1346,7 +1327,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv) i++; } add_group (NULL, NULL); - fclose (f); + m_fclose(&f); mutt_clear_error (); return 0; } @@ -1359,7 +1340,7 @@ 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; string_list_t *tmp; @@ -1374,7 +1355,7 @@ int nntp_get_active (NNTP_SERVER * serv) nntp_data.nserv = serv; nntp_data.group = NULL; - if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) { + if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) { return -1; } @@ -1387,7 +1368,7 @@ int nntp_get_active (NNTP_SERVER * serv) if (data && data->deleted && !data->rc) { nntp_delete_cache (data); - hash_delete (serv->newsgroups, data->group, NULL, nntp_delete_data); + hash_remove (serv->newsgroups, data->group, NULL, nntp_delete_data); tmp->data = NULL; } } @@ -1429,15 +1410,15 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid) typedef struct { CONTEXT *ctx; - unsigned int num; - unsigned int max; - unsigned int *child; + int num; + int max; + int *child; } CHILD_CONTEXT; static int check_children (char *s, void *c) { -#define cc ((CHILD_CONTEXT *) c) - unsigned int i, n; + CHILD_CONTEXT *cc = c; + int i, n; if (!s || (n = atoi (s)) == 0) return 0; @@ -1449,7 +1430,6 @@ static int check_children (char *s, void *c) cc->child[cc->num++] = n; return 0; -#undef cc } int nntp_check_children (CONTEXT * ctx, const char *msgid) @@ -1476,7 +1456,7 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid) cc.ctx = ctx; cc.num = 0; cc.max = 25; - cc.child = p_new(unsigned int, 25); + cc.child = p_new(int, 25); if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) { p_delete(&cc.child); return -1; @@ -1501,3 +1481,36 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid) 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, +};