nntp: use safe_{fopen,fclose}

diff --git a/newsrc.c b/newsrc.c
index 6f7eff01e9d81a40e5253de4d2315c3f89f23b64..a987602861af53b932c30f209546ffb3cf520210 100644 (file)
--- a/newsrc.c
+++ b/newsrc.c
@@ -351,7 +351,7 @@ static int update_file (char *filename, char *buf)
       mutt_perror (tmpfile);
       break;
     }
-    if (fclose (fp) == EOF)
+    if (safe_fclose (&fp) == EOF)
     {
       mutt_perror (tmpfile);
       fp = NULL;
@@ -368,7 +368,7 @@ static int update_file (char *filename, char *buf)
     break;
   }
   if (fp)
-    fclose (fp);
+    safe_fclose (&fp);
   if (*tmpfile)
     unlink (tmpfile);
   if (rc)
@@ -541,7 +541,7 @@ static int active_get_cache (NNTP_SERVER *nserv)
   if (fgets (buf, sizeof (buf), fp) == NULL ||
       sscanf (buf, "%ld%s", &t, file) != 1 || t == 0)
   {
-    fclose (fp);
+    safe_fclose (&fp);
     return -1;
   }
   nserv->newgroups_time = t;
@@ -550,7 +550,7 @@ static int active_get_cache (NNTP_SERVER *nserv)
   while (fgets (buf, sizeof (buf), fp))
     nntp_add_group (buf, nserv);
   nntp_add_group (NULL, NULL);
-  fclose (fp);
+  safe_fclose (&fp);
   mutt_clear_error ();
   return 0;
 }

diff --git a/nntp.c b/nntp.c
index 182d0680d293ae56842965711f9ff2114854aed9..b928aaa4b48614db16045d41b127f9656915567e 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -1078,7 +1078,7 @@ static int parse_overview_line (char *line, void *data)
     {
       if (strstr (header, ":full") == NULL && fputs (header, fp) == EOF)
       {
-       fclose (fp);
+       safe_fclose (&fp);
        unlink (tempfile);
        return -1;
       }
@@ -1090,7 +1090,7 @@ static int parse_overview_line (char *line, void *data)
       *field++ = '\0';
     if (fputs (b, fp) == EOF || fputc ('\n', fp) == EOF)
     {
-      fclose (fp);
+      safe_fclose (&fp);
       unlink (tempfile);
       return -1;
     }
@@ -1106,7 +1106,7 @@ static int parse_overview_line (char *line, void *data)
   hdr->env = mutt_read_rfc822_header (fp, hdr, 0, 0);
   hdr->env->newsgroups = safe_strdup (nntp_data->group);
   hdr->received = hdr->date_sent;
-  fclose (fp);
+  safe_fclose (&fp);
   unlink (tempfile);
 
 #ifdef USE_HCACHE
@@ -1344,7 +1344,7 @@ static int nntp_fetch_headers (CONTEXT *ctx, void *hc,
                             fetch_tempfile, fp);
       if (rc)
       {
-       fclose (fp);
+       safe_fclose (&fp);
        unlink (tempfile);
        if (rc < 0)
          break;
@@ -1373,7 +1373,7 @@ static int nntp_fetch_headers (CONTEXT *ctx, void *hc,
       hdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
       hdr->env = mutt_read_rfc822_header (fp, hdr, 0, 0);
       hdr->received = hdr->date_sent;
-      fclose (fp);
+      safe_fclose (&fp);
       unlink (tempfile);
     }
 
@@ -1580,7 +1580,7 @@ int nntp_fetch_message (CONTEXT *ctx, MESSAGE *msg, int msgno)
   {
     if (acache->index == hdr->index)
     {
-      msg->fp = fopen (acache->path, "r");
+      msg->fp = safe_fopen (acache->path, "r");
       if (msg->fp)
        return 0;
     }
@@ -1744,7 +1744,7 @@ int nntp_post (const char *msg) {
        buf[1] == '.' ? buf : buf + 1, -1, MUTT_SOCK_LOG_HDR) < 0)
       return nntp_connect_error (nntp_data->nserv);
   }
-  fclose (fp);
+  safe_fclose (&fp);
 
   if ((buf[strlen (buf) - 1] != '\n' &&
       mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", -1, MUTT_SOCK_LOG_HDR) < 0) ||
@@ -2312,7 +2312,7 @@ int nntp_check_msgid (CONTEXT *ctx, const char *msgid)
                         fetch_tempfile, fp);
   if (rc)
   {
-    fclose (fp);
+    safe_fclose (&fp);
     unlink (tempfile);
     if (rc < 0)
       return -1;
@@ -2328,7 +2328,7 @@ int nntp_check_msgid (CONTEXT *ctx, const char *msgid)
   hdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
   hdr->data = safe_calloc (1, sizeof (NNTP_HEADER_DATA));
   hdr->env = mutt_read_rfc822_header (fp, hdr, 0, 0);
-  fclose (fp);
+  safe_fclose (&fp);
   unlink (tempfile);
 
   /* get article number */