X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=4265763bb847dbcc4b0f8693dc7a4a9b38281d91;hb=b33ba7a7953d06a123ee59811903f0eb7f69e120;hp=51955920c75b7223f399fc85dcab69a8e7ec29ee;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb;p=mmh

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 5195592..4265763 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -24,7 +24,7 @@
 struct msgs *
 folder_read(char *name)
 {
-	int msgnum, prefix_len, len, *mi;
+	int msgnum, len, *mi;
 	struct msgs *mp;
 	struct stat st;
 	struct dirent *dp;
@@ -38,6 +38,7 @@ folder_read(char *name)
 
 	if (stat(name, &st) == -1) {
 		free(name);
+		closedir(dd);
 		return NULL;
 	}
 
@@ -56,7 +57,6 @@ folder_read(char *name)
 
 	if (access(name, W_OK) == -1)
 		set_readonly(mp);
-	prefix_len = strlen(backup_prefix);
 
 	/*
 	** Allocate a temporary place to record the
@@ -101,25 +101,10 @@ folder_read(char *name)
 			switch (dp->d_name[0]) {
 			case '.':
 			case ',':
-#ifdef MHE
-			case '+':
-#endif /* MHE */
 				continue;
 
 			default:
 				/*
-				** skip any files beginning with
-				** backup prefix
-				*/
-				if (strncmp(dp->d_name, backup_prefix,
-						prefix_len)==0)
-					continue;
-
-				/* skip the altmsg link file */
-				if (strcmp(dp->d_name, altmsglink)==0)
-					continue;
-
-				/*
 				** indicate that there are other
 				** files in folder
 				*/
@@ -138,14 +123,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);