Fixed some of the issues noted by clang --analyze with

[nmh] / sbr / seq_save.c

diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index 94b7543215ae671d89019d96d131dbffc647897e..5b06dcdfe8019c73d7ea54e299b446906d487c26 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -24,14 +24,21 @@
 void
 seq_save (struct msgs *mp)
 {
 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;
 
     /* check if sequence information has changed */
     char flags, *cp, attr[BUFSIZ], seqfile[PATH_MAX];
     FILE *fp;
     sigset_t set, oset;
 
     /* check if sequence information has changed */

-    if (!(mp->msgflags & SEQMOD))
+    if (!(mp->msgflags & SEQMOD)) {
+       if (mp->seqhandle) {
+           lkfclosedata (mp->seqhandle, mp->seqname);
+           mp->seqhandle = NULL;
+           free(mp->seqname);
+           mp->seqname = NULL;
+       }

        return;
        return;

+    }

     mp->msgflags &= ~SEQMOD;
 
     fp = NULL;
     mp->msgflags &= ~SEQMOD;
 
     fp = NULL;


@@ -47,11 +54,12 @@ seq_save (struct msgs *mp)
     else
        snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
     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 */
 
        /* 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;
        }
            context_del (attr);                 /* delete sequence from context */
            continue;
        }


@@ -74,9 +82,17 @@ priv:
                 * If that fails (probably because folder is
                 * readonly), then make sequence private.
                 */
                 * If that fails (probably because folder is
                 * readonly), then make sequence private.
                 */

-               if ((fp = lkfopen (seqfile, "w")) == NULL
-                       && (unlink (seqfile) == -1 ||
-                           (fp = lkfopen (seqfile, "w")) == NULL)) {
+
+               if (mp->seqhandle) {
+                   fp = mp->seqhandle;
+                   mp->seqhandle = NULL;
+                   free(mp->seqname);
+                   mp->seqname = NULL;
+                   rewind(fp);
+                   ftruncate(fileno(fp), 0);
+               } else if ((fp = lkfopendata (seqfile, "w")) == NULL
+                       && (m_unlink (seqfile) == -1 ||
+                           (fp = lkfopendata (seqfile, "w")) == NULL)) {

                    admonish (attr, "unable to write");
                    goto priv;
                }
                    admonish (attr, "unable to write");
                    goto priv;
                }


@@ -87,22 +103,22 @@ priv:
                sigaddset(&set, SIGINT);
                sigaddset(&set, SIGQUIT);
                sigaddset(&set, SIGTERM);
                sigaddset(&set, SIGINT);
                sigaddset(&set, SIGQUIT);
                sigaddset(&set, SIGTERM);

-               SIGPROCMASK (SIG_BLOCK, &set, &oset);
+               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);

        }
     }
 
     if (fp) {
        }
     }
 
     if (fp) {

-       lkfclose (fp, seqfile);
-       SIGPROCMASK (SIG_SETMASK, &oset, &set);  /* reset signal mask */
+       lkfclosedata (fp, seqfile);
+       sigprocmask (SIG_SETMASK, &oset, &set);  /* reset signal mask */

     } else {
        /*
         * If folder is not readonly, and we didn't save any
         * public sequences, then remove that file.
         */
        if (!is_readonly(mp))
     } else {
        /*
         * If folder is not readonly, and we didn't save any
         * public sequences, then remove that file.
         */
        if (!is_readonly(mp))

-           unlink (seqfile);
+           (void) m_unlink (seqfile);

     }
 
     /*
     }
 
     /*