Fix for bug #41618: Supply charset to w3m when converting text/html parts.

[nmh] / sbr / seq_save.c

diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index a431804e65374a6af0206a5b7bc4662b72680c2d..5b06dcdfe8019c73d7ea54e299b446906d487c26 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -24,7 +24,7 @@
 void
 seq_save (struct msgs *mp)
 {
-    int i;
+    size_t i;
     char flags, *cp, attr[BUFSIZ], seqfile[PATH_MAX];
     FILE *fp;
     sigset_t set, oset;
@@ -54,11 +54,12 @@ seq_save (struct msgs *mp)
     else
        snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
-    for (i = 0; mp->msgattrs[i]; i++) {
-       snprintf (attr, sizeof(attr), "atr-%s-%s", mp->msgattrs[i], mp->foldpath);
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       snprintf (attr, sizeof(attr), "atr-%s-%s",
+                 svector_at (mp->msgattrs, i), mp->foldpath);
 
        /* get space separated list of sequence ranges */
-       if (!(cp = seq_list(mp, mp->msgattrs[i]))) {
+       if (!(cp = seq_list(mp, svector_at (mp->msgattrs, i)))) {
            context_del (attr);                 /* delete sequence from context */
            continue;
        }
@@ -90,7 +91,7 @@ priv:
                    rewind(fp);
                    ftruncate(fileno(fp), 0);
                } else if ((fp = lkfopendata (seqfile, "w")) == NULL
-                       && (unlink (seqfile) == -1 ||
+                       && (m_unlink (seqfile) == -1 ||
                            (fp = lkfopendata (seqfile, "w")) == NULL)) {
                    admonish (attr, "unable to write");
                    goto priv;
@@ -104,7 +105,7 @@ priv:
                sigaddset(&set, SIGTERM);
                sigprocmask (SIG_BLOCK, &set, &oset);
            }
-           fprintf (fp, "%s: %s\n", mp->msgattrs[i], cp);
+           fprintf (fp, "%s: %s\n", svector_at (mp->msgattrs, i), cp);
        }
     }
 
@@ -117,7 +118,7 @@ priv:
         * public sequences, then remove that file.
         */
        if (!is_readonly(mp))
-           unlink (seqfile);
+           (void) m_unlink (seqfile);
     }
 
     /*