MH-plus project のぺーじ

 #ifdef __NetBSD__ /* XXX */
-#include <sys/errno.h>
+#include <errno.h>
 #endif

--- uip/picksbr.c.orig	Tue Feb  9 20:30:00 1999
+++ uip/picksbr.c	Fri Apr  9 14:43:38 1999
@@ -401,7 +401,7 @@
 #ifdef MHE
 	    {
 		/* Mule + MH-e have a bug, which output an internal code. */
-		int err = 0;
+		int err = 1;
 		char *pp, *pi, *po;
 		pp = po = getcpy(dp);
 		for (pi = pp; *pi; pi++) {
@@ -410,6 +410,7 @@
 		    else if (*pi == '\222' && ml_ismlptr(pi+1)) {
 			*po++ = *++pi;
 			*po++ = *++pi;
+			err = 0;
 		    } else {
 			err = 1;
 			break;

--- uip/inc.c.orig	Mon Feb  8 20:30:00 1999
+++ uip/inc.c	Fri Apr 16 20:22:48 1999
@@ -248,6 +248,7 @@
     seteuid(real_uid);
 #else
 #ifdef SETREUID
+    getusr();
     setreuid(0, real_uid);
 #endif /* SETREUID */
 #endif /* SETEUID */
--- uip/msgchk.c.orig	Mon Feb  8 20:30:00 1999
+++ uip/msgchk.c	Fri Apr 16 20:24:10 1999
@@ -147,6 +147,7 @@
     seteuid(real_uid);
 #else
 #ifdef SETREUID
+    getusr();
     setreuid(0, real_uid);
 #endif /* SETREUID */
 #endif /* SETEUID */

--- sbr/formatsbr.c.orig	Tue Feb  9 20:30:00 1999
+++ sbr/formatsbr.c	Thu Jun 17 00:41:41 1999
@@ -503,16 +503,8 @@
     int ljust;
     time_t l;
     char        *savestr;
-#ifndef MIME_HEADERS
     char	buffer[BUFSIZ];
 
-#else /* MIME_HEADERS */
-    char	*buffer;
-    int		buflen;
-
-    if ((buffer = malloc(buflen = BUFSIZ)) == NULLCP)
-	adios(NULLCP, "out of memory");
-#endif /* MIME_HEADERS */
     while (cp < ep) {
 	switch (fmt->f_type) {
 
@@ -665,21 +657,23 @@
 #ifdef MIME_HEADERS
 	case FT_LS_HENCODE:
 	    if (str) {
-		unsigned int l;
-		if ((l = strlen(str))*10 >= buflen
-		    && (buffer = realloc(buffer, buflen = l*10+1)) == NULL)
+		char *ep;
+		if ((ep = malloc((unsigned)strlen(str)*10+1)) == NULL)
 		    adios(NULLCP, "out of memory");
-		(void) exthdr_encode(str, buffer, 0, "");
+		(void) exthdr_encode(str, ep, 0, "");
+		(void) strncpy(buffer, ep, BUFSIZ);
+		buffer[BUFSIZ-1] = '\0';
 		str = buffer;
 	    }
 	    break;
 	case FT_LS_HDECODE:
 	    if (str) {
-		unsigned int l;
-		if ((l = strlen(str)) >= buflen
-		    && (buffer = realloc(buffer, buflen = l+1)) == NULL)
+		char *ep;
+		if ((ep = malloc((unsigned)strlen(str)+1)) == NULL)
 		    adios(NULLCP, "out of memory");
-		(void) exthdr_decode(str, buffer);
+		(void) exthdr_decode(str, ep);
+		(void) strncpy(buffer, ep, BUFSIZ);
+		buffer[BUFSIZ-1] = '\0';
 		str = buffer;
 	    }
 	    break;
@@ -1144,9 +1138,6 @@
     if (cp[-1] != '\n')
 	*cp++ = '\n';
     *cp   = 0;
-#ifdef JAPAN
-    free(buffer);
-#endif /* JAPAN */
     return ((struct format *)0);
 #else	/* JLR */
     if (cp[-1] != '\n')
@@ -1156,9 +1147,6 @@
 
     finished:;    
     *cp = '\0';
-#ifdef JAPAN
-    free(buffer);
-#endif /* JAPAN */
     return (fmt -> f_value ? ++fmt : (struct format *)0);
 
 #endif /* JLR */

--- sbr/formatsbr.c.bak	Thu Jun 17 00:41:41 1999
+++ sbr/formatsbr.c	Fri Aug  6 19:19:27 1999
@@ -1015,6 +1015,7 @@
 	    sp = fmt->f_text;
 	    indent = strlen (sp);
 	    wid -= indent;
+	    if (wid <= 0) wid = 1; /* avoid core dump */
 #ifdef JAPAN
 	    while ((ch = *sp++) && (cp < ep))
 		*cp++ = ch;
@@ -1043,16 +1044,24 @@
 			if (uprf(lp + (*lp == '(' ? 1 : 0), "=?")) {
 			    /* avoid to split MIME encoded-word */
 			    char *pp;
-			    for (pp = sp + 1; pp <= lp + 75; pp++)
-				if (isspace(*pp)) {
-				    if (uprf(pp - (*(pp-1) == ')' ? 3 : 2),
-					     "?=")) {
-					sp = pp - 1;
-					if (indent + sp - lp + 1 > 76)
-					    cp -= indent + sp - lp + 1 - 76;
-				    }
-				    break;
+			    for (pp = sp + 1; *pp && !isspace(*pp & 0xff); pp++)
+				;
+			    if (uprf(pp - (*(pp-1) == ')' ? 3 : 2), "?=")) {
+				int l = pp - lp;
+				if (l <= 75 && indent + l > 76) {
+				    int i;
+				    for (i = indent + l - 76; i > 0; i--)
+					if (*(cp - i) != ' ') {
+					    *cp++ = '\n';
+					    for (i = 0; i < 76 - l; i++)
+						*cp++ = ' ';
+					    break;
+					}
+				    if (i == 0)
+					cp -= indent + l - 76;
 				}
+				sp = pp - 1;
+			    }
 			}
 #endif /* MIME_HEADERS */
 		    } else

--- mh-6.8.4-JP-3.02-orig/mts/sendmail/smail.c	Tue Feb  9 20:30:00 1999
+++ mh-6.8.4-JP-3.02/mts/sendmail/smail.c	Thu Sep  9 12:03:39 1999
@@ -1233,16 +1233,18 @@
 
 /*  */
 
-#ifdef _AIX
+#if  defined(_AIX) || (__GLIBC__ > 2) || ((__GLIBC__==2) && (__GLIBC_MINOR__>=1))
 /*
  * AIX by default will inline the strlen and strcpy commands by redefining
  * them as __strlen and __strcpy respectively.  This causes compile problems
  * with the #ifdef MPOP in the middle.  Should the #ifdef MPOP be removed,
  * remove these #undefs.
  */
+#ifdef _AIX
 #undef strlen
-#undef strcpy
 #endif /* _AIX */
+#undef strcpy
+#endif /* _AIX || __GLIBC__ */
 
 static int  sm_werror () {
     sm_reply.length =