X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=afe5c9ecd5d7f7e78b2f028c007cc4d502e72b16;hp=93ad37ba8de211a863601424ed3c4b0290b41c2d;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=230399f9632c37b66c1c117a17e8327eae6b3235 diff --git a/nntp/nntp.c b/nntp/nntp.c index 93ad37b..afe5c9e 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -9,26 +9,15 @@ * please see the file GPL in the top level source directory. */ -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - #include #include - #include #include +#include #include "mutt.h" #include "sort.h" -#include "mx.h" -#include "mx_nntp.h" #include "nntp.h" #include "buffy.h" @@ -43,7 +32,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) { BUFFY* tmp = NULL; char buf[STRING]; - if (list_empty (Incoming)) + if (!Incoming.len) return; /* unfortunately, NNTP_DATA::group only is the plain @@ -64,7 +53,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) { if ((i = buffy_lookup (buf)) < 0) return; - tmp = (BUFFY*) Incoming->data[i]; + tmp = Incoming.arr[i]; /* copied from browser.c */ if (option (OPTMARKOLD) && data->lastCached >= data->firstMessage && @@ -244,7 +233,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); @@ -448,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) @@ -459,14 +448,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) @@ -736,7 +725,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first, 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) @@ -812,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; @@ -926,12 +915,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(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", @@ -952,7 +940,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; @@ -1034,7 +1022,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"); @@ -1099,7 +1087,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; @@ -1112,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; @@ -1214,7 +1202,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); } @@ -1296,7 +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 (CurrentMenu); + sidebar_draw (); } else if (!force) return 0; @@ -1356,7 +1344,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv) i++; } add_group (NULL, NULL); - fclose (f); + m_fclose(&f); mutt_clear_error (); return 0; } @@ -1369,7 +1357,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; @@ -1511,3 +1499,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, +};