Add support for batch mode.

[nmh] / sbr / seq_add.c

diff --git a/sbr/seq_add.c b/sbr/seq_add.c
index d5109b0dcb5b302a92c6c62b0ad7c11e0cb2412d..2641ac4e9227794ed6ee4f1831c1071673465c49 100644 (file)
--- a/sbr/seq_add.c
+++ b/sbr/seq_add.c
@@ -1,6 +1,4 @@
-
-/*
- * seq_add.c -- add message(s) to a sequence
+/* seq_add.c -- add message(s) to a sequence
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -26,7 +24,7 @@ int
 seq_addsel (struct msgs *mp, char *cp, int public, int zero)
 {
     unsigned int i;
-    int msgnum, new_seq = 1;
+    int msgnum;
 
     if (!seq_nameok (cp))
        return 0;
@@ -41,9 +39,10 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
     /*
      * Get the number for this sequence
      */
-    for (i = 0; mp->msgattrs[i]; i++) {
-       if (!strcmp (mp->msgattrs[i], cp)) {
-           new_seq = 0;
+    bool new_seq = true;
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       if (!strcmp (svector_at (mp->msgattrs, i), cp)) {
+           new_seq = false;
            break;
        }
     }
@@ -52,15 +51,10 @@ seq_addsel (struct msgs *mp, char *cp, int public, int zero)
      * If this is a new sequence, add a slot for it
      */
     if (new_seq) {
-       if (i >= NUMATTRS) {
-           advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
-           return 0;
-       }
-       if (!(mp->msgattrs[i] = strdup (cp))) {
-           advise (NULL, "strdup failed");
+       if (!(svector_push_back (mp->msgattrs, strdup (cp)))) {
+           inform("strdup failed");
            return 0;
        }
-       mp->msgattrs[i + 1] = NULL;
     }
 
     /*
@@ -119,7 +113,7 @@ int
 seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
 {
     unsigned int i;
-    int j, new_seq = 1;
+    int j;
 
     if (!seq_nameok (cp))
        return 0;
@@ -133,9 +127,10 @@ seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
     /*
      * Get the number for this sequence
      */
-    for (i = 0; mp->msgattrs[i]; i++) {
-       if (!strcmp (mp->msgattrs[i], cp)) {
-           new_seq = 0;
+    bool new_seq = true;
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       if (!strcmp (svector_at (mp->msgattrs, i), cp)) {
+           new_seq = false;
            break;
        }
     }
@@ -144,15 +139,10 @@ seq_addmsg (struct msgs *mp, char *cp, int msgnum, int public, int zero)
      * If this is a new sequence, add a slot for it
      */
     if (new_seq) {
-       if (i >= NUMATTRS) {
-           advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp);
-           return 0;
-       }
-       if (!(mp->msgattrs[i] = strdup (cp))) {
-           advise (NULL, "strdup failed");
+       if (!(svector_push_back (mp->msgattrs, strdup (cp)))) {
+           inform("strdup failed");
            return 0;
        }
-       mp->msgattrs[i + 1] = NULL;
     }
 
     /*