X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/19304f7c526fbe36ba0db2fb80bcaf3bd974d81d..4a7fd0886acbb7d148af4c27b3897aeefcd5cfc8:/rfc1524.c?ds=sidebyside diff --git a/rfc1524.c b/rfc1524.c index e04a9b0..bc709ae 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -203,7 +203,7 @@ static int rfc1524_mailcap_parse (BODY *a, if ((fp = fopen (filename, "r")) != NULL) { - while (!found && (buf = mutt_read_line (buf, &buflen, fp, &line)) != NULL) + while (!found && (buf = mutt_read_line (buf, &buflen, fp, &line, M_CONT)) != NULL) { /* ignore comments */ if (*buf == '#') @@ -346,7 +346,7 @@ static int rfc1524_mailcap_parse (BODY *a, } } } /* while (!found && (buf = mutt_read_line ())) */ - fclose (fp); + safe_fclose (&fp); } /* if ((fp = fopen ())) */ FREE (&buf); return found; @@ -581,12 +581,12 @@ int mutt_rename_file (char *oldfile, char *newfile) return 3; if ((nfp = safe_fopen (newfile,"w")) == NULL) { - fclose(ofp); + safe_fclose (&ofp); return 3; } mutt_copy_stream (ofp,nfp); - fclose (nfp); - fclose (ofp); + safe_fclose (&nfp); + safe_fclose (&ofp); mutt_unlink (oldfile); return 0; }