*
* to their $HOME/.forward file.
*
- * Under MMDF-I, users should (symbolically) link
- * /usr/local/nmh/lib/slocal to $HOME/bin/rcvmail.
- *
*/
/* Changed to use getutent() and friends. Assumes that when getutent() exists,
/* deliver the message */
status = localmail (fd, mdlvr);
- return done (status != -1 ? RCV_MOK : RCV_MBX);
+ done (status != -1 ? RCV_MOK : RCV_MBX);
+ return 1;
}
}
if (vecp > 5) {
- if (!strcasecmp (vec[5], "select")) {
+ if (!mh_strcasecmp (vec[5], "select")) {
if (logged_in () != -1)
continue;
if (vecp > 7 && timely (vec[6], vec[7]) == -1)
* "default" matches only if the message hasn't
* been delivered yet.
*/
- if (!strcasecmp (field, "default")) {
+ if (!mh_strcasecmp (field, "default")) {
if (won)
continue;
break;
switch (*action) {
case 'q':
/* deliver to quoted pipe */
- if (strcasecmp (action, "qpipe"))
+ if (mh_strcasecmp (action, "qpipe"))
continue; /* else fall */
case '^':
expand (tmpbuf, string, fd);
case 'p':
/* deliver to pipe */
- if (strcasecmp (action, "pipe"))
+ if (mh_strcasecmp (action, "pipe"))
continue; /* else fall */
case '|':
vec[2] = "sh";
case 'f':
/* mbox format */
- if (!strcasecmp (action, "file")) {
+ if (!mh_strcasecmp (action, "file")) {
status = usr_file (fd, string, MBOX_FORMAT);
break;
}
/* deliver to nmh folder */
- else if (strcasecmp (action, "folder"))
+ else if (mh_strcasecmp (action, "folder"))
continue; /* else fall */
case '+':
status = usr_folder (fd, string);
case 'm':
/* mmdf format */
- if (!strcasecmp (action, "mmdf")) {
+ if (!mh_strcasecmp (action, "mmdf")) {
status = usr_file (fd, string, MMDF_FORMAT);
break;
}
/* mbox format */
- else if (strcasecmp (action, "mbox"))
+ else if (mh_strcasecmp (action, "mbox"))
continue; /* else fall */
case '>':
case 'd':
/* ignore message */
- if (strcasecmp (action, "destroy"))
+ if (mh_strcasecmp (action, "destroy"))
continue;
status = 0;
break;
split (char *cp, char **vec)
{
int i;
- char *s;
+ unsigned char *s;
s = cp;
lp = add (field, lp);
}
for (p = hdrs; p->p_name; p++) {
- if (!strcasecmp (p->p_name, name)) {
+ if (!mh_strcasecmp (p->p_name, name)) {
if (!(p->p_flags & P_HID)) {
if ((cp = p->p_value)) {
if (p->p_flags & P_ADR) {
lookup (struct pair *pairs, char *key)
{
for (; pairs->p_name; pairs++)
- if (!strcasecmp (pairs->p_name, key))
+ if (!mh_strcasecmp (pairs->p_name, key))
return pairs;
return NULL;
while ((utp = getutent()) != NULL) {
if (
-#ifdef HAVE_UTMP_UT_TYPE
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
utp->ut_type == USER_PROCESS
&&
#endif
status = pidwait (child_id, 0);
alarm (0);
-#ifdef MMDFI
- if (status == RP_MOK || status == RP_OK)
- status = 0;
-#endif
if (verbose) {
if (status == 0)
verbose_printf (", success.\n");
get_sender (char *envelope, char **sender)
{
int i;
- char *cp;
- char buffer[BUFSIZ];
+ unsigned char *cp;
+ unsigned char buffer[BUFSIZ];
if (envelope == NULL) {
*sender = getcpy ("");
/* return path for UUCP style addressing */
ep = strchr(++hp, '\n');
snprintf (buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n",
- ep - hp, hp, cp - fp, fp);
+ (int)(ep - hp), hp, (int)(cp - fp), fp);
} else {
/* return path for standard domain addressing */
snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n",
- cp - fp, fp);
+ (int)(cp - fp), fp);
}
/* Add Return-Path header to message */
trim (char *cp)
{
char buffer[BUFSIZ*4];
- char *bp, *sp;
+ unsigned char *bp, *sp;
if (cp == NULL)
return NULL;
case FLDPLUS:
case FLDEOF:
/* Search for the message ID */
- if (strcasecmp (name, "Message-ID")) {
+ if (mh_strcasecmp (name, "Message-ID")) {
while (state == FLDPLUS)
state = m_getfld (state, name, buf, sizeof(buf), in);
continue;