Merge commit 'upstream/1.5.21'

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

diff --git a/history.c b/history.c
index 2a711ffee2453814a5a7ceb748654acfbbfa3964..9efbdb47d4ad88546835f7071a25f38fc378c437 100644 (file)
--- a/history.c
+++ b/history.c
@@ -35,7 +35,7 @@ struct history
 static struct history History[HC_LAST];
 static int OldSize = 0;
 
-#define GET_HISTORY(CLASS)     ((CLASS < 0 || CLASS >= HC_LAST) ? NULL : &History[CLASS])
+#define GET_HISTORY(CLASS)     ((CLASS >= HC_LAST) ? NULL : &History[CLASS])
 
 static void init_history (struct history *h)
 {
@@ -68,7 +68,7 @@ void mutt_read_histfile (void)
   if ((f = fopen (HistFile, "r")) == NULL)
     return;
 
-  while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL)
+  while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line, 0)) != NULL)
   {
     read = 0;
     if (sscanf (linebuf, "%d:%n", &hclass, &read) < 1 || read == 0 ||
@@ -90,7 +90,7 @@ void mutt_read_histfile (void)
     }
   }
 
-  fclose (f);
+  safe_fclose (&f);
   FREE (&linebuf);
 }
 
@@ -107,7 +107,7 @@ static void shrink_histfile (void)
     return;
 
   line = 0;
-  while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL)
+  while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line, 0)) != NULL)
   {
     if (sscanf (linebuf, "%d", &hclass) < 1 || hclass < 0)
     {
@@ -123,7 +123,7 @@ static void shrink_histfile (void)
   for(hclass = HC_FIRST; hclass < HC_LAST; hclass++)
     if (n[hclass] > SaveHist)
     {
-      mutt_mktemp (tmpfname);
+      mutt_mktemp (tmpfname, sizeof (tmpfname));
       if ((tmp = safe_fopen (tmpfname, "w+")) == NULL)
         mutt_perror (tmpfname);
       break;
@@ -133,7 +133,7 @@ static void shrink_histfile (void)
   {
     rewind (f);
     line = 0;
-    while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL)
+    while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line, 0)) != NULL)
     {
       if (sscanf (linebuf, "%d", &hclass) < 1 || hclass < 0)
       {
@@ -149,7 +149,7 @@ static void shrink_histfile (void)
   }
 
 cleanup:
-  fclose (f);
+  safe_fclose (&f);
   FREE (&linebuf);
   if (tmp != NULL)
   {
@@ -158,9 +158,9 @@ cleanup:
     {
       rewind (tmp);
       mutt_copy_stream (tmp, f);
-      fclose (f);
+      safe_fclose (&f);
     }
-    fclose (tmp);
+    safe_fclose (&tmp);
     unlink (tmpfname);
   }
 }
@@ -196,7 +196,7 @@ static void save_history (history_class_t hclass, const char *s)
   }
   fputs ("|\n", f);
 
-  fclose (f);
+  safe_fclose (&f);
   FREE (&tmp);
 
   if (--n < 0)