🚀 go-pugleaf

RetroBBS NetNews Server

Inspired by RockSolid Light RIP Retro Guy

Article View: fj.sys.misc
Article #1376

mh6.7.2 patch for RS/6000

#1376
From: FURUHATA Tomotake
Date: Tue, 03 Mar 1992 04:16
655 lines
16594 bytes
$BLGB?$KOCBj$K$N$\$i$J$$(J IBM $B$N(J RS/6000 $B%f!<%6$N%U%k%O%?!w@88&$G$9!#(J

mh $B$,(J 6.7.2 $B$K$J(J$B$j$^$7$?$,!"(JAIX 3.1 $BMQ$N(J MH $B$NNc$H!"%=!<%9$N(J diff $B$r(J
$B0J2<$KEj9F$7$^$9!#(JRPOP $BBP1~$G$9!#(J

----- BEGIN (MH for AIX) -----
#	for rs/6k
bin		/usr/local/bin/mh
etc		/usr/local/lib/mh
mail		/usr/spool/mail
editor		prompter
bboards		off
bbdelivery 	off
bbhome		/usr/spool/bboards
debug		off
ranlib  	on
mailgroup 	mail
mandir		/usr/local/man
manuals		local
chown		/etc/chown
mts		sendmail/smtp
remove		mv -f
sprintf		int
cc		cc
curses		-lcurses
ldoptions
ldoptlibs
lex		lex -nt
sharedlib	off
slibdir		/usr/local/lib
oldload		off
tma		off
options		SYS5 SYS5DIR SOCKETS TYPESIG='void'
options		MHE NETWORK BIND RPATHS MHRC BERK
options		SBACKUP='"\\043"' 
options 	MORE='"/usr/local/bin/less"'
options		MSGPROT='"0600"'
options		DBM
options		DUMB
options 	FOLDERPROT='"0700"'
options 	NTOHLSWAP
options		JAPAN
pop		on
options		POPSERVICE='"pop3"'
options		RPOP
----- END -----

$B0J2<$,%=!<%9$N(J diff $B$G$9!#(J

*** conf/mhconfig.c	Tue Jan 28 02:34:35 1992
--- ../mh-6.7.2.aix/conf/mhconfig.c	Sun Feb 16 17:15:02 1992
***************
*** 570,576 ****
--- 570,580 ----
  	}
  	break;
      }
+ #ifdef _IBMR2
+     if ((config = *vec++) == NULL && *vec != NULL)
+ #else
      if ((config = *vec++) == NULL || *vec != NULL)
+ #endif
  	adios (NULLCP, "usage: %s file", myname);
  
      if ((fp = fopen (config, "r")) == NULL)
*** conf/config/mts.c	Fri Feb 15 08:18:22 1991
--- ../mh-6.7.2.aix/conf/config/mts.c	Sun Feb 16 17:15:51 1992
***************
*** 43,49 ****
--- 43,51 ----
  #define	rindex	strrchr
  #endif	SYS5
  
+ #ifndef _IBMR2
  char   *index (), *malloc (), *mktemp (), *rindex (), *strcpy ();
+ #endif _IBMR2
  
  struct passwd  *getpwuid ();
  
***************
*** 292,298 ****
--- 294,304 ----
  		grot ('t', '\t');
  #undef	grot
  
+ #ifndef _IBMR2
  		case NULL: s--;
+ #else
+ 		case '\0': s--;
+ #endif _IBMR2
  		case QUOTE: 
  		    *bp = QUOTE;
  		    break;
*** conf/config/mtstailor	Fri Jun 16 05:10:12 1989
--- ../mh-6.7.2.aix/conf/config/mtstailor	Thu Aug 29 00:24:01 1991
***************
*** 1,4 ****
  mmdfldir:	@(MHDROPATH)
  mmdflfil:	@(MHDROPFIL)
  hostable:	@(MHETCPATH)/hosts
! servers:	localhost \01localnet
--- 1,12 ----
  mmdfldir:	@(MHDROPATH)
  mmdflfil:	@(MHDROPFIL)
+ uucpldir:	/usr/spool/mail
+ uucplfil:	
+ mmdelim1:	\001\001\001\001\n
+ mmdelim2:	\001\001\001\001\n
+ mmailid:	0
+ umincproc:
+ lockldir:
+ 
  hostable:	@(MHETCPATH)/hosts
! sendmail:	/usr/lib/sendmail
*** conf/makefiles/support/pop	Wed Dec 19 06:34:38 1990
--- ../mh-6.7.2.aix/conf/makefiles/support/pop	Sun Feb 16 17:12:22 1992
***************
*** 7,13 ****
  
  # The following entries were inserted during MH configuration
  BINDIR	=	$(DESTDIR)@(MHBINPATH)
! ETCDIR	=	/usr/etc
  LIBDIR	=	$(DESTDIR)@(MHETCPATH)
  OPTIONS	=	@(MHOPTIONS) @(POPUUMBOX) -I..
  LDOPTIONS=	@(LDOPTIONS)
--- 7,13 ----
  
  # The following entries were inserted during MH configuration
  BINDIR	=	$(DESTDIR)@(MHBINPATH)
! ETCDIR	=	/etc
  LIBDIR	=	$(DESTDIR)@(MHETCPATH)
  OPTIONS	=	@(MHOPTIONS) @(POPUUMBOX) -I..
  LDOPTIONS=	@(LDOPTIONS)
*** h/local.h	Fri Oct 30 07:56:18 1987
--- ../mh-6.7.2.aix/h/local.h	Thu Aug 29 00:33:12 1991
***************
*** 6,19 ****
  #include <sys/param.h>
  #endif	BSD42
  
! #ifndef	BSD42
  #ifndef NDIR
  #include <dir.h>
  #else	NDIR
  #include <ndir.h>
  #endif  NDIR
! #else	BSD42
  #include <sys/dir.h>
! #endif	BSD42
  
  #include <sys/stat.h>
--- 6,19 ----
  #include <sys/param.h>
  #endif	BSD42
  
! #if !defined(BSD42) && !defined(_IBMR2)
  #ifndef NDIR
  #include <dir.h>
  #else	NDIR
  #include <ndir.h>
  #endif  NDIR
! #else	BSD42 || _IBMR2
  #include <sys/dir.h>
! #endif	BSD42 || _IBMR2
  
  #include <sys/stat.h>
*** h/mh.h	Fri Jan 24 09:03:59 1992
--- ../mh-6.7.2.aix/h/mh.h	Sun Feb 16 17:28:05 1992
***************
*** 344,350 ****
  
  /* miscellaneous */
  
! #if !defined(BSD42) && !defined(hpux) && !defined(ncr)
  #define	rename(f1,f2)	(link (f1, f2) != NOTOK ? unlink (f1) : NOTOK)
  #endif	not BSD42
  
--- 344,350 ----
  
  /* miscellaneous */
  
! #if !defined(BSD42) && !defined(hpux) && !defined(ncr) && !defined(_IBMR2)
  #define	rename(f1,f2)	(link (f1, f2) != NOTOK ? unlink (f1) : NOTOK)
  #endif	not BSD42
  
*** h/strings.h	Fri Jan 24 08:16:49 1992
--- ../mh-6.7.2.aix/h/strings.h	Sun Feb 16 17:15:07 1992
***************
*** 12,17 ****
--- 12,18 ----
  char   *index ();
  char   *mktemp ();
  char   *rindex ();
+ #ifndef _IBMR2
  #ifndef	SPRINTFTYPE
  #ifndef	ncr		/* NCR compiler complains about re-declaration */
  char   *sprintf ();		/* I guess this is the new standard */
***************
*** 29,36 ****
  
  char   *getenv ();
  char   *calloc (), *malloc (), *realloc ();
  
! #ifdef	SYS5
  #include <memory.h>
  #define bcmp(b1,b2,length)	memcmp(b1, b2, length)
  #define	bcopy(b1,b2,length)	(void) memcpy (b2, b1, length)
--- 30,48 ----
  
  char   *getenv ();
  char   *calloc (), *malloc (), *realloc ();
+ #endif !_IBMR2
  
! #ifdef _IBMR2
! #include <strings.h>
! #define       index   strchr
! #define       rindex  strrchr
! #define bcmp(b1,b2,length)    memcmp(b1, b2, length)
! #define       bcopy(b1,b2,length)     (void) memcpy (b2, b1, length)
! #define       bcpy(b1,b2,length)      memcmp (b1, b2, length)
! #define       bzero(b,length)         (void) memset (b, 0, length)
! #endif _IBMR2
! 
! #if defined(SYS5) && !defined(_IBMR2)
  #include <memory.h>
  #define bcmp(b1,b2,length)	memcmp(b1, b2, length)
  #define	bcopy(b1,b2,length)	(void) memcpy (b2, b1, length)
***************
*** 39,41 ****
--- 51,54 ----
  #endif	SYS5
  
  #endif	not _STRINGS
+ 
*** sbr/formatsbr.c	Thu Feb 27 14:55:15 1992
--- ../mh-6.7.2.aix/sbr/formatsbr.c	Sun Feb 16 17:15:16 1992
***************
*** 100,106 ****
--- 100,110 ----
  		case '\n':
  		    break;
  
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif
  		    cp--;	/* fall */
  		default: 
  		    *dp++ = *cp;
***************
*** 782,789 ****
--- 786,817 ----
  	     * disturb string or value registers.
  	     */
  	    if (fmt_current_folder)
+ 		    (void)m_seqadd(fmt_current_folder, fmt->f_text, dat[0], -1);
+ 	    break;
+ #endif
+ 	}
+ 	fmt++;
+     }
+ #ifndef JLR
+     finished:;
+     if (cp[-1] != '\n')
+ 	*cp++ = '\n';
+     *cp   = NULL;
+     return ((struct format *)0);
+ #else	/* JLR */
+     if (cp[-1] != '\n')
+ 	*cp++ = '\n';
+     while (fmt->f_type != FT_DONE)
+ 	fmt++;
  
+     finished:;    
+     *cp = '\0';
+     return (fmt -> f_value ? ++fmt : (struct format *)0);
  
+ #endif /* JLR */
+ }
+ 
+ 
  /*
   *  for KANJI
   *    by Hiroaki KOJIMA
***************
*** 836,862 ****
  	}
  }
  
- 		    (void)m_seqadd(fmt_current_folder, fmt->f_text, dat[0], -1);
- 	    break;
- #endif
- 	}
- 	fmt++;
-     }
- #ifndef JLR
-     finished:;
-     if (cp[-1] != '\n')
- 	*cp++ = '\n';
-     *cp   = NULL;
-     return ((struct format *)0);
- #else	/* JLR */
-     if (cp[-1] != '\n')
- 	*cp++ = '\n';
-     while (fmt->f_type != FT_DONE)
- 	fmt++;
- 
-     finished:;    
-     *cp = '\0';
-     return (fmt -> f_value ? ++fmt : (struct format *)0);
- 
- #endif /* JLR */
- }
--- 864,866 ----
*** sbr/makedir.c	Fri Jan 24 08:12:50 1992
--- ../mh-6.7.2.aix/sbr/makedir.c	Sun Feb 16 17:25:55 1992
***************
*** 3,9 ****
  static char ident[] = "@(#)$Id: makedir.c,v 1.7 1992/01/23 23:12:43 jromine Exp $";
  #endif	lint
  
! #if defined (BSD42) || defined (hpux)
  /* Modified to try recursive create.  Really, this should be broken
   * out into a subr so that SYS5 systems can do this too.  I don't 
   * have a SYS5 machine around to test anymore, so someone else will
--- 3,9 ----
  static char ident[] = "@(#)$Id: makedir.c,v 1.7 1992/01/23 23:12:43 jromine Exp $";
  #endif	lint
  
! #if defined (BSD42) || defined (hpux) || defined(_IBMR2)
  /* Modified to try recursive create.  Really, this should be broken
   * out into a subr so that SYS5 systems can do this too.  I don't 
   * have a SYS5 machine around to test anymore, so someone else will
***************
*** 14,20 ****
  #include "../h/mh.h"
  #include <stdio.h>
  
! #if defined (BSD42)  || defined (hpux)
  #include <errno.h>
  #include <sys/param.h>
  #include <sys/file.h>
--- 14,20 ----
  #include "../h/mh.h"
  #include <stdio.h>
  
! #if defined (BSD42)  || defined (hpux) || defined(_IBMR2)
  #include <errno.h>
  #include <sys/param.h>
  #include <sys/file.h>
***************
*** 31,37 ****
  {
      int     pid;
      register char  *cp;
! #if defined (BSD42)  || defined (hpux) || defined (SYS5DIR)
      register char  *c;
      char path[MAXPATHLEN];
  #endif BSD42
--- 31,37 ----
  {
      int     pid;
      register char  *cp;
! #if defined (BSD42)  || defined (hpux) || defined(SYS5DIR) || defined(_IBMR2)
      register char  *c;
      char path[MAXPATHLEN];
  #endif BSD42
*** sbr/path.c	Wed Feb  7 06:09:03 1990
--- ../mh-6.7.2.aix/sbr/path.c	Thu Aug 29 00:24:15 1991
***************
*** 107,113 ****
--- 107,117 ----
      for (cp = f; *cp;)
  	if (*cp == '/') {
  	    switch (*++cp) {
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif _IBMR2
  		    if (--cp > f)
  			*cp = NULL;
  		    break;
*** support/pop/popd.c	Tue Apr 10 01:45:16 1990
--- ../mh-6.7.2.aix/support/pop/popd.c	Sun Feb 16 16:32:58 1992
***************
*** 104,110 ****
--- 104,114 ----
  #ifdef	RESTART
      for (;;) {
  	char    reason[BUFSIZ];
+ #ifdef _IBMR2
+ 	int status;
+ #else _IBMR2
  	union wait status;
+ #endif _IBMR2
  
  	switch (fork ()) {
  	    case NOTOK: 
***************
*** 135,141 ****
      }
  
      closelog ();
! #ifndef	BSD43
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
--- 139,145 ----
      }
  
      closelog ();
! #if !defined(BSD43) && !defined(_IBMR2)
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
***************
*** 147,153 ****
  
      if ((sd = socket (AF_INET, SOCK_STREAM, 0)) == NOTOK)
  	padios ("socket", "unable to create");
! #ifndef	BSD43
      if (options & SO_DEBUG)
  	if (setsockopt (sd, SOL_SOCKET, SO_DEBUG, NULL, 0) == NOTOK)
  	    padvise ("SO_DEBUG", LOG_WARNING, "unable to set socket option");
--- 151,157 ----
  
      if ((sd = socket (AF_INET, SOCK_STREAM, 0)) == NOTOK)
  	padios ("socket", "unable to create");
! #if !defined(BSD43) && !defined(_IBMR2)
      if (options & SO_DEBUG)
  	if (setsockopt (sd, SOL_SOCKET, SO_DEBUG, NULL, 0) == NOTOK)
  	    padvise ("SO_DEBUG", LOG_WARNING, "unable to set socket option");
***************
*** 211,217 ****
      struct in_addr *addr;
  
      closelog ();
! #ifndef	BSD43
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
--- 215,221 ----
      struct in_addr *addr;
  
      closelog ();
! #if !defined(BSD43) && !defined(_IBMR2)
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
***************
*** 316,322 ****
  
      (void) signal (SIGPIPE, SIG_IGN);
  
! #ifndef	BSD43
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
--- 320,326 ----
  
      (void) signal (SIGPIPE, SIG_IGN);
  
! #if !defined(BSD43) && !defined(_IBMR2)
      openlog (myname, LOG_PID);
  #else	BSD43
      openlog (myname, LOG_PID, LOG_DAEMON);
***************
*** 338,344 ****
--- 342,354 ----
  long    code;
  struct sigcontext *sc;
  {
+ #ifndef _IBMR2
      union wait status;
+ #else
+     int status;
+ 
+     (void) signal (SIGCHLD, chldser);
+ #endif _IBMR2
  
      while (wait3 (&status, WNOHANG, NULLRP) > 0)
  	continue;
*** support/pop/syslog.c	Fri Apr  6 08:02:51 1990
--- ../mh-6.7.2.aix/support/pop/syslog.c	Sun Feb 16 16:27:16 1992
***************
*** 1,4 ****
! #if !defined (BSD43) && !defined(hpux)
  #ifndef lint
  static char SccsId[] =	"@(#)syslog.c	4.1 (Berkeley) 5/27/83";
  #endif
--- 1,4 ----
! #if !defined (BSD43) && !defined(hpux) && !defined(_IBMR2)
  #ifndef lint
  static char SccsId[] =	"@(#)syslog.c	4.1 (Berkeley) 5/27/83";
  #endif
*** uip/ali.c	Fri Apr  6 08:03:56 1990
--- ../mh-6.7.2.aix/uip/ali.c	Fri Jul 12 16:08:26 1991
***************
*** 190,197 ****
  			    printf (", ");
  			    pos += 2;
  			}
! 
! 	    case NULL: 
  		break;
  
  	    default: 
--- 190,200 ----
  			    printf (", ");
  			    pos += 2;
  			}
! #ifndef _IBMR2
! 	    case NULL:
! #else
! 	    case '\0':
! #endif
  		break;
  
  	    default: 
*** uip/aliasbr.c	Fri Apr  6 08:03:33 1990
--- ../mh-6.7.2.aix/uip/aliasbr.c	Thu Aug 29 00:24:18 1991
***************
*** 152,158 ****
--- 152,162 ----
  	    case ':': 		/* comment */
  	    case ';': 
  	    case '#':
+ #ifndef _IBMR2
  	    case NULL: 
+ #else
+ 	    case '\0': 
+ #endif
  		continue;
  	}
  
***************
*** 180,186 ****
--- 184,194 ----
  	}
  
  	switch (*(pp = scanp (ap))) {
+ #ifndef _IBMR2
  	    case NULL: 		/* EOL */
+ #else
+ 	    case '\0': 		/* EOL */
+ #endif _IBMR2
  		(void) fclose (fp);
  		return AK_ERROR;
  
*** uip/msh.c	Fri Apr  6 08:02:57 1990
--- ../mh-6.7.2.aix/uip/msh.c	Thu Aug 29 00:24:22 1991
***************
*** 1562,1568 ****
--- 1562,1572 ----
  	    case '"': 
  		for (;;) {
  		    switch (c = *cp++) {
+ #ifndef _IBMR2
  			case NULL: 
+ #else
+ 			case '\0': 
+ #endif
  			    padvise (NULLCP, "unmatched \"");
  			    return NOTOK;
  			case '"': 
*** zotnet/bboards/getbbent.c	Wed Aug  7 02:23:18 1991
--- ../mh-6.7.2.aix/zotnet/bboards/getbbent.c	Sun Feb 16 17:15:47 1992
***************
*** 646,652 ****
--- 646,656 ----
  		    hp = item;
  		    break;
  
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif _IBMR2
  		    if ((cp = rindex (bb -> bb_file, '/')) == NULL || *++cp == NULL)
  			(void) strcpy (prf, ""), cp = bb -> bb_file;
  		    else
*** zotnet/mf/mf.c	Fri Jan 31 07:40:38 1992
--- ../mh-6.7.2.aix/zotnet/mf/mf.c	Sun Feb 16 17:15:49 1992
***************
*** 810,816 ****
--- 810,820 ----
      if (c == '(')
  	for (*bp++ = c, i = 0;;)
  	    switch (c = *cp++) {
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif _IBMR2
  		    cp = NULL;
  		    return (last_lex = LX_ERR);
  		case QUOTE: 
***************
*** 841,847 ****
--- 845,855 ----
      if (c == '"')
  	for (*bp++ = c;;)
  	    switch (c = *cp++) {
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif
  		    cp = NULL;
  		    return (last_lex = LX_ERR);
  		case QUOTE: 
***************
*** 862,868 ****
--- 870,880 ----
      if (c == '[')
  	for (*bp++ = c;;)
  	    switch (c = *cp++) {
+ #ifndef _IBMR2
  		case NULL: 
+ #else
+ 		case '\0': 
+ #endif
  		    cp = NULL;
  		    return (last_lex = LX_ERR);
  		case QUOTE: 
***************
*** 965,971 ****
--- 977,987 ----
  		pp = NULL;
  		return DONE;
  
+ #ifndef _IBMR2
  	    case NULL: 
+ #else
+ 	    case '\0': 
+ #endif
  		continue;
  
  	    case '\n': 
*** zotnet/tws/lexedit.sed	Fri Apr  6 08:06:01 1990
--- ../mh-6.7.2.aix/zotnet/tws/lexedit.sed	Thu Aug 29 00:24:31 1991
***************
*** 9,11 ****
--- 9,17 ----
  } }
  /^struct yysvf *yybgin = yysvec+1;$/d
  /^int yylineno /,$d
+ /^# define YYTYPE short/c\
+ # define YYTYPE int
+ /^unsigned char yymatch\[\] = {/c\
+ char yymatch[] = {
+ /^unsigned char yyextra\[\] = {/c\
+ char yyextra[] = {
Technical Details
Message-ID: <FURUHATA.92Mar3131650@daikon.fujita3.iis.u-tokyo.ac.jp>
Path: arc1-ca.pugleaf.net!sparky!uunet!sun-barr!ccut!kappa!chikuwa!furuhata

Show Full Headers
Complete Article Headers
X-Google-Language: Japanese,JIS
X-Google-Thread: 1070da,70a1b8eb9ef17020,start
X-Google-Attributes: gid1070da,public
X-Google-ArrivalTime: 1992-03-02 20:58:12 PST
Path: arc1-ca.pugleaf.net!sparky!uunet!sun-barr!ccut!kappa!chikuwa!furuhata
From: furuhata@fujita3.iis.u-tokyo.ac.jp (FURUHATA Tomotake)
Newsgroups: fj.sys.misc
Subject: mh6.7.2 patch for RS/6000
Message-ID: <FURUHATA.92Mar3131650@daikon.fujita3.iis.u-tokyo.ac.jp>
Date: 3 Mar 92 04:16:50 GMT
Sender: news@fujita3.iis.u-tokyo.ac.jp
Distribution: fj
Organization: Institute of Industrial Science, University of Tokyo
Lines: 655
Nntp-Posting-Host: daikon.fujita3.iis.u-tokyo.ac.jp