* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 993a141..4a8875e 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -16,9 +16,6 @@
  *
  *  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,
@@ -32,6 +29,7 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #include <pwd.h>
 #include <signal.h>
@@ -414,7 +412,8 @@ main (int argc, char **argv)
     /* deliver the message */
     status = localmail (fd, mdlvr);
 
-    return done (status != -1 ? RCV_MOK : RCV_MBX);
+    done (status != -1 ? RCV_MOK : RCV_MBX);
+    return 1;
 }
 
 
@@ -556,7 +555,7 @@ usr_delivery (int fd, char *delivery, int su)
        }
 
        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)
@@ -575,7 +574,7 @@ usr_delivery (int fd, char *delivery, int su)
             * "default" matches only if the message hasn't
             * been delivered yet.
             */
-               if (!strcasecmp (field, "default")) {
+               if (!mh_strcasecmp (field, "default")) {
                    if (won)
                        continue;
                    break;
@@ -605,7 +604,7 @@ usr_delivery (int fd, char *delivery, int su)
        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);
@@ -616,7 +615,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'p': 
                /* deliver to pipe */
-               if (strcasecmp (action, "pipe"))
+               if (mh_strcasecmp (action, "pipe"))
                    continue;   /* else fall */
            case '|': 
                vec[2] = "sh";
@@ -629,12 +628,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            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);
@@ -642,12 +641,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            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 '>': 
@@ -657,7 +656,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'd': 
                /* ignore message */
-               if (strcasecmp (action, "destroy"))
+               if (mh_strcasecmp (action, "destroy"))
                    continue;
                status = 0;
                break;
@@ -685,7 +684,7 @@ static int
 split (char *cp, char **vec)
 {
     int i;
-    char *s;
+    unsigned char *s;
 
     s = cp;
 
@@ -781,7 +780,7 @@ parse (int fd)
                    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) {
@@ -935,7 +934,7 @@ static struct pair *
 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;
@@ -960,7 +959,7 @@ logged_in (void)
 
     while ((utp = getutent()) != NULL) {
         if (
-#ifdef HAVE_UTMP_UT_TYPE
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
                utp->ut_type == USER_PROCESS
                 &&
 #endif
@@ -1190,10 +1189,6 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
                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");
@@ -1238,8 +1233,8 @@ static void
 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 ("");
@@ -1366,11 +1361,11 @@ you_lose:
                    /* 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 */
@@ -1418,7 +1413,7 @@ static char *
 trim (char *cp)
 {
     char buffer[BUFSIZ*4];
-    char *bp, *sp;
+    unsigned char *bp, *sp;
 
     if (cp == NULL)
        return NULL;
@@ -1543,7 +1538,7 @@ suppress_duplicates (int fd, char *file)
            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;