X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=159d2e1f8c7410c33dc937af4500848c3d7f58c6;hp=ca3e51edc33d253555ed9a1ec556cac14b83851a;hb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c diff --git a/nntp/nntp.c b/nntp/nntp.c index ca3e51e..159d2e1 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -17,22 +17,23 @@ #include #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 "sidebar.h" #include "buffy.h" -#include "mutt_crypt.h" +#include -#include "lib/debug.h" #include #include @@ -159,9 +160,9 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv) 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; } @@ -311,7 +312,7 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen) return -1; } while (!done); - strfcpy (line, buf, linelen); + m_strcpy(line, linelen, buf); return 0; } @@ -338,7 +339,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg, 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') @@ -366,7 +367,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg, p++; } - strfcpy (inbuf + lenbuf, p, sizeof (buf)); + m_strcpy(inbuf + lenbuf, sizeof(buf), p); pos += chunk; if (chunk >= sizeof (buf)) { @@ -555,7 +556,7 @@ 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 = envelope_new(); hdr->env->newsgroups = m_strdup(nntp_data->group); hdr->content = mutt_new_body (); hdr->content->type = TYPETEXT; @@ -583,7 +584,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) hdr->env->subject = m_strdup(b); break; case 2: - rfc822_free_address (&hdr->env->from); + address_delete (&hdr->env->from); hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b); /* same as for mutt_parse_rfc822_line(): * don't leave from info NULL if there's an invalid address (or @@ -591,7 +592,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) * and mark mail/(esp.) news article as your own. aaargh! this * bothered me for _years_ */ if (!hdr->env->from) { - hdr->env->from = rfc822_new_address (); + hdr->env->from = address_new (); hdr->env->from->personal = m_strdup(b); } break; @@ -620,7 +621,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr) hdr->env->xref = m_strdup(b); nntp_parse_xref (ctx, nntp_data->group, b, hdr); } - rfc2047_decode_envelope (hdr->env); + rfc2047_decode_envelope(hdr->env); if (!*p) return -1; b = p; @@ -666,7 +667,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]); @@ -682,7 +683,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; } @@ -811,7 +812,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); @@ -821,7 +822,7 @@ 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) { p_delete(&fc.messages); return -1; @@ -989,7 +990,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) 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 */ @@ -1039,7 +1040,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); @@ -1431,7 +1432,7 @@ int nntp_get_active (NNTP_SERVER * serv) return -1; } - strfcpy (msg, _("Loading descriptions..."), sizeof (msg)); + m_strcpy(msg, sizeof(msg), _("Loading descriptions...")); mutt_message (msg); nntp_get_desc (&nntp_data, "*", msg, NULL); @@ -1463,7 +1464,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); @@ -1471,7 +1472,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);