X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=4a8875e7c2cbbe8054f97c82eb6fb284ea200139;hp=275eedd48d8bb7bbb1830a4b60906e15288bfdf6;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=59a210325d70e6a38c0ef9e5dcb105cec8bd38d2

diff --git a/uip/slocal.c b/uip/slocal.c
index 275eedd..4a8875e 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -412,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;
 }
 
 
@@ -554,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)
@@ -573,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;
@@ -603,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);
@@ -614,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";
@@ -627,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);
@@ -640,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 '>': 
@@ -655,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;
@@ -683,7 +684,7 @@ static int
 split (char *cp, char **vec)
 {
     int i;
-    char *s;
+    unsigned char *s;
 
     s = cp;
 
@@ -779,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) {
@@ -933,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;
@@ -958,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
@@ -1232,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 ("");
@@ -1360,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 */
@@ -1412,7 +1413,7 @@ static char *
 trim (char *cp)
 {
     char buffer[BUFSIZ*4];
-    char *bp, *sp;
+    unsigned char *bp, *sp;
 
     if (cp == NULL)
 	return NULL;
@@ -1537,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;