X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=35dc1950a4f7dde864da0ea93c444cc27cf5f639;hp=cdbf344d18d72af97bc7018149c8d2b7fdccac92;hb=30292c537fe4eab052f303f1d3179c0e2fd037d8;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index cdbf344..35dc195 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -38,6 +38,7 @@ folder_read(char *name)
 
 	if (stat(name, &st) == -1) {
 		free(name);
+		closedir(dd);
 		return NULL;
 	}
 
@@ -101,9 +102,6 @@ folder_read(char *name)
 			switch (dp->d_name[0]) {
 			case '.':
 			case ',':
-#ifdef MHE
-			case '+':
-#endif /* MHE */
 				continue;
 
 			default:
@@ -111,12 +109,8 @@ folder_read(char *name)
 				** skip any files beginning with
 				** backup prefix
 				*/
-				if (!strncmp(dp->d_name, backup_prefix,
-						prefix_len))
-					continue;
-
-				/* skip the altmsg link file */
-				if (!strcmp(dp->d_name, altmsglink))
+				if (strncmp(dp->d_name, backup_prefix,
+						prefix_len)==0)
 					continue;
 
 				/*
@@ -138,14 +132,14 @@ folder_read(char *name)
 	/* for testing, allocate minimal necessary space */
 	/* mp->hghoff = max(mp->hghmsg, 1); */
 
-	/*
-	** Allocate space for status of each message.
-	*/
+	/* 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);