Patch #: 124 Type: operational change Priority: none Modification: add support for ICL DRS6000 (IPTalk only) Submitted: Michael G. Brown Archived: munnari.OZ.AU mac/cap.patches/cap60.patch124 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch124' Summary: various changes for ICL DRS/NX 4 (System VR4) File: cap60/Configure File: cap60/conf.func.sh File: cap60/netat/sysvcompat.h File: cap60/applications/lwsrv/procset.c File: cap60/applications/aufs/afpos.c File: cap60/applications/aufs/afposenum.c *** Configure.orig Thu Jul 30 19:30:41 1992 --- Configure Sat Aug 1 22:16:28 1992 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 1992/07/30 09:30:24 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.49 1992/07/30 09:30:24 djh Rel djh $ ! # $Revision: 2.49 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # --- 1,7 ---- #!/bin/sh ! # $Author: djh $ $Date: 1992/08/01 12:16:03 $ ! # $Header: /mac/src/cap60/RCS/Configure,v 2.50 1992/08/01 12:16:03 djh Rel djh $ ! # $Revision: 2.50 $ # CAP configuration shell script. This ain't perfect, but it's a start. # Execute with /bin/sh Configure if your system won't run it (ksh is okay too) # *************** *** 135,140 **** --- 135,153 ---- fi fi fi + #ICL DRS6000 with DRS/NX 4.0 + if [ -z "${osdefault}" ]; then + echo "Checking for DRS/NX" + if [ -f /bin/uname ]; then + if [ `uname -m` = "DRS6000" ]; then + if [ `uname -s` = "unix" ]; then + echo "drsnx - ensure /usr/ucb comes before /usr/bin" + osdefault="drsnx" + lpd="lp" + fi + fi + fi + fi useauxappletalk=0 # A/UX, hpux, SCO Xenix System V if [ -z "${osdefault}" ]; then *************** *** 252,257 **** --- 265,271 ---- "dynix") valid=1;; "irix") valid=1;; "newsos") valid=1;; + "drsnx") valid=1;; "?"|*) if [ "${os}" != "?" ]; then echo "unknown type ${os}, valid are:" *************** *** 272,277 **** --- 286,292 ---- echo " dynix - Sequent Balance" echo " irix - Silicon Graphics IRIS/IRIX" echo " newsos - Sony NEWS" + echo " drsnx - ICL DRS/NX V4.0" ;; esac done *************** *** 906,911 **** --- 921,932 ---- ${PNM} /lib/386/Slibx.a >> /tmp/cx$$ ${PNM} /lib/386/Slibsocket.a >> /tmp/cx$$ ;; + "drsnx") + echo "Getting name list from /usr/ccs/libc.a /usr/ucblib/libucb.a..." + ${PNM} /usr/ccs/lib/libc.a > /tmp/cx$$ + ${PNM} /usr/ucblib/libucb.a >> /tmp/cx$$ + ${PNM} /usr/lib/libsocket.a >> /tmp/cx$$ + ;; *) if [ -f /lib/libc.a ]; then echo "Getting name list from /lib/libc.a..." *************** *** 984,989 **** --- 1005,1011 ---- # "dynix" - Sequent Balance # "irix" - Silicon Graphics IRIS-4D/IRIX # "newsos" - Sony NEWS + # "drsnx" - ICL DRS/NX V4.0 # Warning: hpux, pyr are hardcoded in some of the makefiles (sorry) # MAJOR CONFIGURATION *************** *** 1105,1110 **** --- 1127,1134 ---- define([libspecial],concat(libspecial,[ -lauth]))]) ifelse(os,[xenix5],[ define([libspecial],concat(libspecial,[ -lsocket]))]) + ifelse(os,[drsnx],[ + define([libspecial],concat(libspecial,[ -lucb]))]) ifelse(os,[uts],[ define([libspecial],concat(libspecial,[ -lsocket -lbsd -la]))]) ifelse(os,[dynix],[ *************** *** 1242,1247 **** --- 1266,1272 ---- ifelse(os,[dynix],[define([osname],[Sequent Balance])]) ifelse(os,[irix],[define([osname],[Silicon Graphics IRIS/IRIX])]) ifelse(os,[newsos],[define([osname],[Sony NEWS])]) + ifelse(os,[drsnx],[define([osname],[ICL DRS])]) # define([cflags],ifdef([selfdefinetypes],[-D_TYPES],[])) define([cflags],concat(cflags,ifdef([usebyteswap],[ -DBYTESWAPPED],[]))) *************** *** 1262,1267 **** --- 1287,1294 ---- define([cflags],concat(cflags,[ -eft ]))]) ifelse(os,[irix],[ define([cflags],concat(cflags,[ -D_BSD_COMPAT]))]) + ifelse(os,[drsnx],[ + define([cflags],concat(cflags,[ -DNOWAIT3]))]) # was used for nbp, but found we needed more... leave in case define([nbpflags],[]) *************** *** 1275,1280 **** --- 1302,1311 ---- define([cflags],concat(cflags,[ -n -Daux])) define([lflags],concat(lflags,[ -n]))]) + # use the transitional option of the C compiler - interpret as K&R C, not ANSI + ifelse(os,[drsnx],[ + define([cflags],concat(cflags,[ -Xt -Ddrsnx]))]) + # check to see if we need sysvinstall usage ifelse(os,[hpux],[define([sysvinstall],[yes])], os,[irix],[define([sysvinstall],[yes])]) *************** *** 1318,1323 **** --- 1349,1355 ---- ifelse(os,[dummy],[define(uselordertsort,[1])], os,[aux], [define(uselordertsort,[1])], os,[uts], [define(uselordertsort,[1])], + os,[drsnx],[define(uselordertsort,[1])], os,[irix], [define(uselordertsort,[1])]) # lw config *** conf.func.sh.orig Thu Feb 28 23:42:20 1991 --- conf.func.sh Sat Aug 1 22:31:42 1992 *************** *** 1,7 **** #!/bin/sh ! # $Author: djh $ $Date: 91/02/15 20:45:52 $ ! # $Header: conf.func.sh,v 2.1 91/02/15 20:45:52 djh Rel $ ! # $Revision: 2.1 $ # # CAP function configuration script. This ain't perfect, but it's a start # execute with /bin/sh Configure if your system won't run it (ksh is okay --- 1,7 ---- #!/bin/sh ! # $Author: djh $ $Date: 1992/08/01 12:31:30 $ ! # $Header: /mac/src/cap60/RCS/conf.func.sh,v 2.2 1992/08/01 12:31:30 djh Rel djh $ ! # $Revision: 2.2 $ # # CAP function configuration script. This ain't perfect, but it's a start # execute with /bin/sh Configure if your system won't run it (ksh is okay *************** *** 89,97 **** grep "Symbols from" < ${NLIST} > /dev/null 2>/dev/null rc=$? if [ $rc -eq 0 ]; then ! echo "nm output has \"Symbols from\" in it, assuming" ! echo "System V style, will grep for function name followed by space" ! gc=" " else echo "BSD style, will grep for function name at end of the line" gc="$" --- 89,105 ---- grep "Symbols from" < ${NLIST} > /dev/null 2>/dev/null rc=$? if [ $rc -eq 0 ]; then ! if [ `uname` = "unix" ]; then ! if [ `uname -r` = "4.0" ]; then ! echo "nm output has \"Symbols from\" in it, but it looks like a" ! echo "Sys VR4 system, will grep for function name at end of line" ! gc="$" ! fi ! else ! echo "nm output has \"Symbols from\" in it, assuming" ! echo "System V style, will grep for function name followed by space" ! gc=" " ! fi else echo "BSD style, will grep for function name at end of the line" gc="$" *** netat/sysvcompat.h.orig Thu Jul 30 19:56:47 1992 --- netat/sysvcompat.h Sat Aug 1 23:33:30 1992 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1992/07/30 09:56:22 $ ! * $Header: /mac/src/cap60/netat/RCS/sysvcompat.h,v 2.5 1992/07/30 09:56:22 djh Rel djh $ ! * $Revision: 2.5 $ */ /* --- 1,7 ---- /* ! * $Author: djh $ $Date: 1992/08/01 13:33:20 $ ! * $Header: /mac/src/cap60/netat/RCS/sysvcompat.h,v 2.6 1992/08/01 13:33:20 djh Rel djh $ ! * $Revision: 2.6 $ */ /* *************** *** 135,137 **** --- 135,142 ---- #define L_INCR 1 #define L_XTND 2 #endif xenix5 + + #ifdef drsnx + #define USESYSVLP + #define USEDIRENT + #endif drsnx *** applications/lwsrv/procset.c.orig Mon Jun 29 22:04:01 1992 --- applications/lwsrv/procset.c Sat Aug 1 22:59:13 1992 *************** *** 1,6 **** ! static char rcsid[] = "$Author: djh $ $Date: 1992/06/29 12:03:45 $"; ! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/procset.c,v 2.6 1992/06/29 12:03:45 djh Rel djh $"; ! static char revision[] = "$Revision: 2.6 $"; /* * procset - UNIX AppleTalk spooling program: act as a laserwriter --- 1,6 ---- ! static char rcsid[] = "$Author: djh $ $Date: 1992/08/01 12:58:48 $"; ! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/procset.c,v 2.7 1992/08/01 12:58:48 djh Rel djh $"; ! static char revision[] = "$Revision: 2.7 $"; /* * procset - UNIX AppleTalk spooling program: act as a laserwriter *************** *** 29,35 **** #ifdef xenix5 #include #else xenix5 ! #include #endif xenix5 #include #include --- 29,37 ---- #ifdef xenix5 #include #else xenix5 ! # ifndef drsnx ! # include ! # endif drsnx #endif xenix5 #include #include *************** *** 94,107 **** if (stat(fn, &stb) < 0) return(FALSE); #ifdef USEDIRENT ! #ifdef AIX if (S_ISREG(stb.st_mode) == 0) /* make sure regular file */ return(FALSE); ! #else AIX /* sysv follows xpg standards */ if (S_ISREG(&stb) == 0) /* make sure regular file */ return(FALSE); ! #endif AIX #else USEDIRENT if (S_ISREG(stb.st_mode) == 0) /* make sure regular file */ return(FALSE); --- 96,109 ---- if (stat(fn, &stb) < 0) return(FALSE); #ifdef USEDIRENT ! #if defined (AIX) | defined (drsnx) if (S_ISREG(stb.st_mode) == 0) /* make sure regular file */ return(FALSE); ! #else AIX | drsnx /* sysv follows xpg standards */ if (S_ISREG(&stb) == 0) /* make sure regular file */ return(FALSE); ! #endif AIX | drsnx #else USEDIRENT if (S_ISREG(stb.st_mode) == 0) /* make sure regular file */ return(FALSE); *** applications/aufs/afpos.c.orig Tue Jul 14 21:31:19 1992 --- applications/aufs/afpos.c Sat Aug 1 23:05:30 1992 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1992/07/14 11:30:17 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.27 1992/07/14 11:30:17 djh Rel djh $ ! * $Revision: 2.27 $ */ /* --- 1,7 ---- /* ! * $Author: djh $ $Date: 1992/08/01 13:05:17 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.28 1992/08/01 13:05:17 djh Rel djh $ ! * $Revision: 2.28 $ */ /* *************** *** 81,87 **** #ifdef xenix5 #include #else xenix5 ! #include #endif xenix5 #include #include --- 81,89 ---- #ifdef xenix5 #include #else xenix5 ! # ifndef drsnx ! # include ! # endif drsnx #endif xenix5 #include #include *************** *** 163,168 **** --- 165,176 ---- # include # include #endif USEGETMNT + + #ifdef drsnx + # ifdef USESTATFS + # undef USESTATFS /* ICL DRS/NX statfs() is a little different */ + # endif USESTATFS + #endif drsnx #include #include /* flags should be in misc */ *** applications/aufs/afposenum.c.orig Tue Jul 28 01:33:15 1992 --- applications/aufs/afposenum.c Sat Aug 1 23:14:33 1992 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1992/07/27 15:32:49 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/afposenum.c,v 2.8 1992/07/27 15:32:49 djh Rel djh $ ! * $Revision: 2.8 $ */ /* --- 1,7 ---- /* ! * $Author: djh $ $Date: 1992/08/01 13:13:18 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/afposenum.c,v 2.10 1992/08/01 13:13:18 djh Rel djh $ ! * $Revision: 2.10 $ */ /* *************** *** 32,38 **** #ifdef xenix5 #include #else xenix5 ! #include #endif xenix5 #include #include --- 32,40 ---- #ifdef xenix5 #include #else xenix5 ! # ifndef drsnx ! # include ! # endif drsnx #endif xenix5 #include #include *************** *** 131,136 **** --- 133,142 ---- struct direct *d; #endif USEDIRENT { + if (d == NULL) + return(FALSE); + if (d->d_name == NULL) + return(FALSE); if (ENameLen(d->d_name) > MAXLFLEN) /* external name too long? */ return(FALSE); /* sorry this name is too long */ if (d->d_name[0] != '.') /* all special dirs begin with dot */ *** lib/cap/abversion.c.orig Thu Jul 30 20:06:58 1992 --- lib/cap/abversion.c Sat Aug 1 23:37:48 1992 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1992/07/30 10:06:52 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.23 1992/07/30 10:06:52 djh Rel djh $ ! * $Revision: 2.23 $ */ /* --- 1,7 ---- /* ! * $Author: djh $ $Date: 1992/08/01 13:37:41 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.24 1992/08/01 13:37:41 djh Rel djh $ ! * $Revision: 2.24 $ */ /* *************** *** 31,37 **** myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 123; myversion.cv_rmonth = "July"; myversion.cv_ryear = "1992"; switch (lap_proto) { --- 31,37 ---- myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 124; myversion.cv_rmonth = "July"; myversion.cv_ryear = "1992"; switch (lap_proto) { *** README.orig Thu Jul 30 20:08:03 1992 --- README Sat Aug 1 23:38:35 1992 *************** *** 2,8 **** CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 123, July 1992 Notice ------ --- 2,8 ---- CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 124, July 1992 Notice ------