X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_read.c;h=ec51d64e664947ce87687ee4140e5ca2f515792b;hp=c28b430182f711ceec9103c573ec38fa0b2b00fc;hb=0595979e1f0514b3da28762f336b3b9ac9eec5c5;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index c28b430..ec51d64 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
@@ -24,7 +27,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 +41,7 @@ folder_read(char *name)
 
 	if (stat(name, &st) == -1) {
 		free(name);
+		closedir(dd);
 		return NULL;
 	}
 
@@ -56,7 +60,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
@@ -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;
 			}
 
 			/*
@@ -99,31 +102,17 @@ folder_read(char *name)
 
 		} else {
 			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))
-						continue;
-
-					/* skip the altmsg link file */
-					if (!strcmp(dp->d_name, altmsglink))
-						continue;
-
-					/*
-					** indicate that there are other
-					** files in folder
-					*/
-					set_other_files(mp);
-					continue;
+			case '.':
+			case ',':
+				continue;
+
+			default:
+				/*
+				** indicate that there are other
+				** files in folder
+				*/
+				set_other_files(mp);
+				continue;
 			}
 		}
 	}
@@ -137,14 +126,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);