X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=0dec537e29a848bffbd14708eb64a1db9472889d;hp=b5b3f9d58792eb8c769d135554d3f976bce38bdb;hb=fb49dd82ec42997b9df97f221c920f6596102c0a;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index b5b3f9d..0dec537 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define	NUMMSGS  1024
@@ -44,8 +45,7 @@ folder_read (char *name)
     }
 
     /* 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;
@@ -57,7 +57,7 @@ folder_read (char *name)
     mp->numsel = 0;
     mp->nummsg = 0;
 
-    if (access (name, W_OK) == -1 || st.st_uid != getuid())
+    if (access (name, W_OK) == -1)
 	set_readonly (mp);
     prefix_len = strlen(BACKUP_PREFIX);
 
@@ -66,21 +66,17 @@ folder_read (char *name)
      * 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))) {
-	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;
-		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 */
@@ -138,8 +134,7 @@ folder_read (char *name)
     /*
      * 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->msgstats = mh_xmalloc (MSGSTATSIZE(mp, mp->lowoff, mp->hghoff));
 
     /*
      * Clear all the flag bits for all the message