Remove extra arguments from two anno tests; the check() function now

[nmh] / sbr / folder_read.c

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index b5b3f9d58792eb8c769d135554d3f976bce38bdb..170946b41ec351696a686da18bff73a2ae71869f 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -2,14 +2,13 @@
 /*
  * folder_read.c -- initialize folder structure and read folder
  *
 /*
  * folder_read.c -- initialize folder structure and read folder
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024


@@ -24,13 +23,15 @@
  */
 
 struct msgs *
  */
 
 struct msgs *

-folder_read (char *name)
+folder_read (char *name, int lockflag)

 {
     int msgnum, prefix_len, len, *mi;
     struct msgs *mp;
     struct stat st;
     struct dirent *dp;
     DIR *dd;
 {
     int msgnum, prefix_len, len, *mi;
     struct msgs *mp;
     struct stat st;
     struct dirent *dp;
     DIR *dd;

+    bvector_t *v;
+    size_t i;

 
     name = m_mailpath (name);
     if (!(dd = opendir (name))) {
 
     name = m_mailpath (name);
     if (!(dd = opendir (name))) {


@@ -44,8 +45,7 @@ folder_read (char *name)
     }
 
     /* Allocate the main structure for folder information */
     }
 
     /* Allocate the main structure for folder information */

-    if (!(mp = (struct msgs *) malloc ((size_t) sizeof(*mp))))
-       adios (NULL, "unable to allocate folder storage");
+    mp = (struct msgs *) mh_xmalloc ((size_t) sizeof(*mp));

 
     clear_folder_flags (mp);
     mp->foldpath = name;
 
     clear_folder_flags (mp);
     mp->foldpath = name;


@@ -56,8 +56,10 @@ folder_read (char *name)
     mp->hghsel = 0;
     mp->numsel = 0;
     mp->nummsg = 0;
     mp->hghsel = 0;
     mp->numsel = 0;
     mp->nummsg = 0;

+    mp->seqhandle = NULL;
+    mp->seqname = NULL;

 
 

-    if (access (name, W_OK) == -1 || st.st_uid != getuid())
+    if (access (name, W_OK) == -1)

        set_readonly (mp);
     prefix_len = strlen(BACKUP_PREFIX);
 
        set_readonly (mp);
     prefix_len = strlen(BACKUP_PREFIX);
 


@@ -66,21 +68,17 @@ folder_read (char *name)
      * name of the messages in this folder.
      */
     len = NUMMSGS;
      * name of the messages in this folder.
      */
     len = NUMMSGS;

-    if (!(mi = (int *) malloc ((size_t) (len * sizeof(*mi)))))
-       adios (NULL, "unable to allocate storage");
+    mi = (int *) mh_xmalloc ((size_t) (len * sizeof(*mi)));

 
     while ((dp = readdir (dd))) {
 
     while ((dp = readdir (dd))) {

-       if ((msgnum = m_atoi (dp->d_name))) {
+       if ((msgnum = m_atoi (dp->d_name)) && msgnum > 0) {

            /*
             * Check if we need to allocate more
             * temporary elements for message names.
             */
            if (mp->nummsg >= len) {
                len += NUMMSGS;
            /*
             * Check if we need to allocate more
             * temporary elements for message names.
             */
            if (mp->nummsg >= len) {
                len += NUMMSGS;

-               if (!(mi = (int *) realloc (mi,
-                       (size_t) (len * sizeof(*mi))))) {
-                   adios (NULL, "unable to allocate storage");
-               }
+               mi = (int *) mh_xrealloc (mi, (size_t) (len * sizeof(*mi)));

            }
 
            /* Check if this is the first message we've seen */
            }
 
            /* Check if this is the first message we've seen */


@@ -105,9 +103,6 @@ folder_read (char *name)
            switch (dp->d_name[0]) {
                case '.': 
                case ',': 
            switch (dp->d_name[0]) {
                case '.': 
                case ',': 

-#ifdef MHE
-               case '+': 
-#endif /* MHE */

                    continue;
 
                default: 
                    continue;
 
                default: 


@@ -138,8 +133,13 @@ folder_read (char *name)
     /*
      * Allocate space for status of each message.
      */
     /*
      * Allocate space for status of each message.
      */

-    if (!(mp->msgstats = malloc (MSGSTATSIZE(mp, mp->lowoff, mp->hghoff))))
-       adios (NULL, "unable to allocate storage for msgstats");
+    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);
+    }
+
+    mp->msgattrs = svector_create (0);

 
     /*
      * Clear all the flag bits for all the message
 
     /*
      * Clear all the flag bits for all the message


@@ -161,7 +161,7 @@ folder_read (char *name)
     /*
      * Read and initialize the sequence information.
      */
     /*
      * Read and initialize the sequence information.
      */

-    seq_read (mp);
+    seq_read (mp, lockflag);

 
     return mp;
 }
 
     return mp;
 }