Revert "debian/control: s/exim4/default-mta (Closes: 533442)"

[software/mutt-debian.git] / rfc1524.c

diff --git a/rfc1524.c b/rfc1524.c
index e04a9b06644272cc090108a721e76bb59dfc2d61..bc709aef63b18bd69972c1ef07b595dfe5d1ff57 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -203,7 +203,7 @@ static int rfc1524_mailcap_parse (BODY *a,
 
   if ((fp = fopen (filename, "r")) != NULL)
   {
 
   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 == '#')
     {
       /* ignore comments */
       if (*buf == '#')


@@ -346,7 +346,7 @@ static int rfc1524_mailcap_parse (BODY *a,
        }
       }
     } /* while (!found && (buf = mutt_read_line ())) */
        }
       }
     } /* while (!found && (buf = mutt_read_line ())) */

-    fclose (fp);
+    safe_fclose (&fp);

   } /* if ((fp = fopen ())) */
   FREE (&buf);
   return found;
   } /* 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)
   {
     return 3;
   if ((nfp = safe_fopen (newfile,"w")) == NULL)
   {

-    fclose(ofp);
+    safe_fclose (&ofp);

     return 3;
   }
   mutt_copy_stream (ofp,nfp);
     return 3;
   }
   mutt_copy_stream (ofp,nfp);

-  fclose (nfp);
-  fclose (ofp);
+  safe_fclose (&nfp);
+  safe_fclose (&ofp);

   mutt_unlink (oldfile);
   return 0;
 }
   mutt_unlink (oldfile);
   return 0;
 }