projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send: Convert system() to execprog() ... partly
[mmh]
/
sbr
/
folder_read.c
diff --git
a/sbr/folder_read.c
b/sbr/folder_read.c
index
5195592
..
159949a
100644
(file)
--- a/
sbr/folder_read.c
+++ b/
sbr/folder_read.c
@@
-24,7
+24,7
@@
struct msgs *
folder_read(char *name)
{
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;
struct msgs *mp;
struct stat st;
struct dirent *dp;
@@
-38,6
+38,7
@@
folder_read(char *name)
if (stat(name, &st) == -1) {
free(name);
if (stat(name, &st) == -1) {
free(name);
+ closedir(dd);
return NULL;
}
return NULL;
}
@@
-56,7
+57,6
@@
folder_read(char *name)
if (access(name, W_OK) == -1)
set_readonly(mp);
if (access(name, W_OK) == -1)
set_readonly(mp);
- prefix_len = strlen(backup_prefix);
/*
** Allocate a temporary place to record the
/*
** Allocate a temporary place to record the
@@
-86,9
+86,9
@@
folder_read(char *name)
** lowest we've seen?
*/
if (msgnum < mp->lowmsg)
** lowest we've seen?
*/
if (msgnum < mp->lowmsg)
- mp->lowmsg = msgnum;
+ mp->lowmsg = msgnum;
if (msgnum > mp->hghmsg)
if (msgnum > mp->hghmsg)
- mp->hghmsg = msgnum;
+ mp->hghmsg = msgnum;
}
/*
}
/*
@@
-101,25
+101,10
@@
folder_read(char *name)
switch (dp->d_name[0]) {
case '.':
case ',':
switch (dp->d_name[0]) {
case '.':
case ',':
-#ifdef MHE
- case '+':
-#endif /* MHE */
continue;
default:
/*
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
*/
** 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); */
/* 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.
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);
*/
for (msgnum = mp->lowoff; msgnum <= mp->hghoff; msgnum++)
clear_msg_flags(mp, msgnum);