m_getfld() et al: Replace with m_getfld2(), etc., in many places.

[nmh] / sbr / folder_read.c

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 4a9f7fbaf68af5a87d29bd5d1bdc59f5e92e6ea3..4edd8db6df9afce125526242c98bf66a8cf886fa 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -1,6 +1,4 @@
-
-/*
- * folder_read.c -- initialize folder structure and read folder
+/* folder_read.c -- initialize folder structure and read folder
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024
@@ -25,11 +24,11 @@
 struct msgs *
 folder_read (char *name, int lockflag)
 {
-    int msgnum, prefix_len, len, *mi;
+    int msgnum, len, *mi;
     struct msgs *mp;
     struct dirent *dp;
     DIR *dd;
-    bvector_t *v;
+    struct bvector *v;
     size_t i;
 
     name = m_mailpath (name);
@@ -39,8 +38,7 @@ folder_read (char *name, int lockflag)
     }
 
     /* Allocate the main structure for folder information */
-    mp = (struct msgs *) mh_xmalloc ((size_t) sizeof(*mp));
-
+    NEW(mp);
     clear_folder_flags (mp);
     mp->foldpath = name;
     mp->lowmsg = 0;
@@ -55,7 +53,6 @@ folder_read (char *name, int lockflag)
 
     if (access (name, W_OK) == -1)
        set_readonly (mp);
-    prefix_len = strlen(BACKUP_PREFIX);
 
     /*
      * Allocate a temporary place to record the
@@ -101,7 +98,7 @@ folder_read (char *name, int lockflag)
 
                default: 
                    /* skip any files beginning with backup prefix */
-                   if (!strncmp (dp->d_name, BACKUP_PREFIX, prefix_len))
+                   if (has_prefix(dp->d_name, BACKUP_PREFIX))
                        continue;
 
                    /* skip the LINK file */
@@ -124,24 +121,27 @@ folder_read (char *name, int lockflag)
     /* for testing, allocate minimal necessary space */
     /* mp->hghoff = max (mp->hghmsg, 1); */
 
+    /*
+     * If for some reason hghoff < lowoff (like we got an integer overflow)
+     * the complain about this now.
+     */
+
+    if (mp->hghoff < mp->lowoff) {
+       adios(NULL, "Internal failure: high message limit < low message "
+             "limit; possible overflow?");
+    }
+
     /*
      * Allocate space for status of each message.
      */
     mp->num_msgstats = MSGSTATNUM (mp->lowoff, mp->hghoff);
     mp->msgstats = mh_xmalloc (MSGSTATSIZE(mp));
     for (i = 0, v = mp->msgstats; i < mp->num_msgstats; ++i, ++v) {
-       *v = bvector_create (0);
+        bvector_init(v);
     }
 
     mp->msgattrs = svector_create (0);
 
-    /*
-     * Clear all the flag bits for all the message
-     * status entries we just allocated.
-     */
-    for (msgnum = mp->lowoff; msgnum <= mp->hghoff; msgnum++)
-       clear_msg_flags (mp, msgnum);
-
     /*
      * Scan through the array of messages we've seen and
      * setup the initial flags for those messages in the
@@ -155,7 +155,15 @@ folder_read (char *name, int lockflag)
     /*
      * Read and initialize the sequence information.
      */
-    seq_read (mp, lockflag);
+    if (seq_read (mp, lockflag) == NOTOK) {
+        char seqfile[PATH_MAX];
+
+        /* Failed to lock sequence file. */
+        snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
+        advise (seqfile, "failed to lock");
+
+        return NULL;
+    }
 
     return mp;
 }