** 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
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;
if (stat(name, &st) == -1) {
free(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;
if (access(name, W_OK) == -1)
set_readonly(mp);
- prefix_len = strlen(backup_prefix);
/*
** Allocate a temporary place to record the
** 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) {
*/
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 */
** lowest we've seen?
*/
if (msgnum < mp->lowmsg)
- mp->lowmsg = msgnum;
+ mp->lowmsg = msgnum;
if (msgnum > mp->hghmsg)
- mp->hghmsg = msgnum;
+ mp->hghmsg = msgnum;
}
/*
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
*/
/* for testing, allocate minimal necessary space */
/* mp->hghoff = max(mp->hghmsg, 1); */
- /*
- ** Allocate space for status of each message.
- */
- mp->msgstats = mh_xmalloc(MSGSTATSIZE(mp, mp->lowoff, mp->hghoff));
+ /* Allocate space for status of each message. */
+
+ mp->msgstats = mh_xcalloc(MSGSTATSIZE(mp, mp->lowoff, mp->hghoff), 1);
/*
** 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);