X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=011958f861d342ab1998d8af3d8d2456d4622515;hp=4265763bb847dbcc4b0f8693dc7a4a9b38281d91;hb=b3d32781d25365c2270210bc9ef7b645d83b8dbe;hpb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 4265763..011958f 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -6,8 +6,11 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <h/utils.h>
+#include <dirent.h>
+#include <sys/stat.h>
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define NUMMSGS  1024
@@ -30,20 +33,20 @@ folder_read(char *name)
 	struct dirent *dp;
 	DIR *dd;
 
-	name = getcpy(toabsdir(name));
+	name = mh_xstrdup(toabsdir(name));
 	if (!(dd = opendir(name))) {
-		free(name);
+		mh_free0(&name);
 		return NULL;
 	}
 
 	if (stat(name, &st) == -1) {
-		free(name);
+		mh_free0(&name);
 		closedir(dd);
 		return NULL;
 	}
 
 	/* Allocate the main structure for folder information */
-	mp = (struct msgs *) mh_xmalloc((size_t) sizeof(*mp));
+	mp = mh_xcalloc(1, sizeof(*mp));
 
 	clear_folder_flags(mp);
 	mp->foldpath = name;
@@ -63,7 +66,7 @@ folder_read(char *name)
 	** name of the messages in this folder.
 	*/
 	len = NUMMSGS;
-	mi = (int *) mh_xmalloc((size_t) (len * sizeof(*mi)));
+	mi = mh_xcalloc(len, sizeof(*mi));
 
 	while ((dp = readdir(dd))) {
 		if ((msgnum = m_atoi(dp->d_name)) && msgnum > 0) {
@@ -73,7 +76,7 @@ folder_read(char *name)
 			*/
 			if (mp->nummsg >= len) {
 				len += NUMMSGS;
-				mi = (int *) mh_xrealloc(mi, (size_t) (len * sizeof(*mi)));
+				mi = mh_xrealloc(mi, len * sizeof(*mi));
 			}
 
 			/* Check if this is the first message we've seen */
@@ -86,9 +89,9 @@ folder_read(char *name)
 				** lowest we've seen?
 				*/
 				if (msgnum < mp->lowmsg)
-				   mp->lowmsg = msgnum;
+					mp->lowmsg = msgnum;
 				if (msgnum > mp->hghmsg)
-				   mp->hghmsg = msgnum;
+					mp->hghmsg = msgnum;
 			}
 
 			/*
@@ -125,15 +128,7 @@ folder_read(char *name)
 
 	/* Allocate space for status of each message. */
 
-	mp->msgstats = mh_xmalloc(MSGSTATSIZE(mp, mp->lowoff, mp->hghoff));
-
-	/*
-	** Clear all the flag bits for all the message
-	** status entries we just allocated.
-	** TODO: use memset() ?
-	*/
-	for (msgnum = mp->lowoff; msgnum <= mp->hghoff; msgnum++)
-		clear_msg_flags(mp, msgnum);
+	mp->msgstats = mh_xcalloc(MSGSTATSIZE(mp, mp->lowoff, mp->hghoff), 1);
 
 	/*
 	** Scan through the array of messages we've seen and
@@ -143,7 +138,7 @@ folder_read(char *name)
 	for (msgnum = 0; msgnum < mp->nummsg; msgnum++)
 		set_exists(mp, mi[msgnum]);
 
-	free(mi);  /* We don't need this anymore */
+	mh_free0(&mi);  /* We don't need this anymore */
 
 	/*
 	** Read and initialize the sequence information.