/*
* dropsbr.c -- create/read/manipulate mail drops
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
*/
#include <h/nmh.h>
+#include <h/utils.h>
-#ifndef MMDFONLY
-# include <h/mh.h>
-# include <h/dropsbr.h>
-# include <h/mts.h>
-# include <h/tws.h>
-#else
-# include "dropsbr.h"
-# include "strings.h"
-# include "mmdfonly.h"
-#endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <h/mh.h>
+#include <h/dropsbr.h>
+#include <h/mts.h>
+#include <h/tws.h>
+#include <errno.h>
#ifdef NTOHLSWAP
# include <netinet/in.h>
static int
mbx_chk_mmdf (int fd)
{
- size_t count;
+ ssize_t count;
char ldelim[BUFSIZ];
count = strlen (mmdlm2);
- /* casting -count to off_t, seem to break FreeBSD 2.2.6 */
- if (lseek (fd, (long) (-count), SEEK_END) == (off_t) NOTOK)
+ if (lseek (fd, -count, SEEK_END) == (off_t) NOTOK)
return NOTOK;
if (read (fd, ldelim, count) != count)
return NOTOK;
if (dp >= ep) {
register int curlen = dp - pp;
- cp = (struct drop *) realloc ((char *) pp,
+ cp = (struct drop *) mh_xrealloc ((char *) pp,
(size_t) (len += MAXFOLDER) * sizeof(*pp));
- if (cp == NULL) {
- if (noisy)
- admonish (NULL, "unable to allocate drop storage");
- free ((char *) pp);
- return 0;
- }
dp = cp + curlen, ep = (pp = cp) + len - 1;
}
}
fp = strchr(ep + 1, '\n');
tp = dctime(dlocaltimenow());
snprintf (buffer, sizeof(buffer), "From %.*s %s",
- fp - ep, ep, tp);
+ (int)(fp - ep), ep, tp);
} else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
/*
* Change the "X-Envelope-From:" field
int
mbx_close (char *mailbox, int md)
{
- lkclose (md, mailbox);
- return OK;
+ if (lkclose (md, mailbox) == 0)
+ return OK;
+ return NOTOK;
}
if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
dp = cp + strlen (cp);
if (cp == file)
- snprintf (buffer, sizeof(buffer), ".%.*s%s", dp - cp, cp, ".map");
+ snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, ".map");
else
snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
- cp - file, file, dp - cp, cp, ".map");
+ (int)(cp - file), file, (int)(dp - cp), cp, ".map");
return buffer;
}
memcpy((char *) dp, (char *) mp, sizeof(*dp));
lseek (md, (off_t) sizeof(*mp), SEEK_SET);
- if ((i = read (md, (char *) (dp + 1), msgp * sizeof(*dp))) < sizeof(*dp)) {
+ if ((i = read (md, (char *) (dp + 1), msgp * sizeof(*dp))) <
+ (int) sizeof(*dp)) {
i = 0;
free ((char *) dp);
} else {
mode_t mode;
struct stat st;
- mode = fstat (md, &st) != NOTOK ? (mode_t) (st.st_mode & 0777) : m_gmprot ();
+ mode = fstat (md, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
return mbx_open (file, OTHER_FORMAT, st.st_uid, st.st_gid, mode);
}
int
map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
{
- long count;
+ ssize_t count;
struct drop d, tmpd;
register struct drop *dl;
}
dl = &d;
- count = (long) strlen (mmdlm2);
+ count = strlen (mmdlm2);
lseek (fd, (off_t) (dp->d_id * sizeof(*dp)), SEEK_SET);
if (read (fd, (char *) dl, sizeof(*dl)) != sizeof(*dl)
|| (ntohl(dl->d_stop) != dp->d_stop