fubar@sequent.com (Jay Vosburgh) (12/18/90)
The following patch will enable ISIS v2.1 to run on a Sequent Symmetry running Dynix 3.0.17. It "should" work on older versions of Dynix, but I haven't tried it, so you may have to fiddle with it. -J --- -Jay Vosburgh, Sequent Computer Systems, Inc; fubar@sequent.com -----cut here-----cut here-----cut here-----cut here----- #!/bin/sh # This is a shell archive, meaning: # 1. Remove everything above the #!/bin/sh line. # 2. Save the resulting text in a file. # 3. Execute the file with /bin/sh (not csh) to create the files: # README.DYNIX-PATCH # ISIS-DIFFS-DYNIX # This archive created: Mon Dec 17 12:14:12 1990 # By: Jay Vosburgh (Campus Crusade for Cthulhu) export PATH; PATH=/bin:$PATH echo shar: extracting "'README.DYNIX-PATCH'" '(1576 characters)' if test -f 'README.DYNIX-PATCH' then echo shar: over-writing existing file "'README.DYNIX-PATCH'" fi sed 's/^X//' << \SHAR_EOF > 'README.DYNIX-PATCH' X To apply this patch and install ISIS v2.1 on your Symmetry, you Xprobably want to do something like this: X X 1) chdir to one directory above the isisv2.1 main directory. X X 2) "patch -p < ISIS-DIFFS-DYNIX"; if you don't say "-p", patch X will make you type in every file name.... X X 3) If you're paranoid, "find isisv21 -name '*.rej' -print" X X 4) "chdir isisv21" X X 5) "make DYNIX_DIR_MADE"; this just makes the build area, you need X to change something in there before you actually build ISIS. X X 6) "cd DYNIX" X X 6) "vi makefile"; change STRTOKLIB to be correct for you. You X probably just want to change the stuff before "isisv2.1" in X the pathname. If you've got strtok() in your libc, then you X can probably just leave STRTOKLIB empty. X X 7) "make strtoklib"; this will create a library containing X strtok(). This requires that you have the SVAE (System V X Application Environment) installed, since it extracts the X strtok() object files from the att universe libc. If you X don't have the SVAE, you'll have to acquire strtok() X somewhere else. It appears that strtok source can be found X on uunet.uu.net, in bsd-sources/lib/libc/string. I haven't X tried them, so I have no way of knowing if they work. X X 8) "cd .." X X 9) "make DYNIX"; this should build all of ISIS. Note that the X fortran_test and the sun_grid demos won't build, you'll see X an error message about them near the end of the build. X Everything else should build, although I haven't thoroughly X tested all of it. X X 10) "cd run_isis" and do what the README says. SHAR_EOF if test 1576 -ne "`wc -c 'README.DYNIX-PATCH'`" then echo shar: error transmitting "'README.DYNIX-PATCH'" '(should have been 1576 characters)' fi echo shar: extracting "'ISIS-DIFFS-DYNIX'" '(47240 characters)' if test -f 'ISIS-DIFFS-DYNIX' then echo shar: over-writing existing file "'ISIS-DIFFS-DYNIX'" fi sed 's/^X//' << \SHAR_EOF > 'ISIS-DIFFS-DYNIX' XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE and isisv2.1//BINARY-TEMPLATE XOnly in isisv2.1/: DYNIX XOnly in isisv2.1/: DYNIX_DIR_MADE XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//FILES and isisv2.1//FILES Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//Makefile isisv2.1//Makefile X*** ../ISIS-VIRGIN/isisv2.1//Makefile Wed Sep 26 13:57:09 1990 X--- isisv2.1//Makefile Mon Dec 3 12:55:38 1990 X*************** X*** 1,5 X HOSTS = AIX-RS AIX-RT AIX-RT43 APOLLO AUX DEC2100 DEC3100 GOULD HPSPECT \ X! HPUX MACH MIPS NEXT SGI SUN3 SUN4 VAX CONVEX PTX X X help: X @cat README X X--- 1,5 ----- X HOSTS = AIX-RS AIX-RT AIX-RT43 APOLLO AUX DEC2100 DEC3100 GOULD HPSPECT \ X! HPUX MACH MIPS NEXT SGI SUN3 SUN4 VAX CONVEX DYNIX X X help: X @cat README X*************** X*** 119,125 X @cp FILES/CONVEX.README CONVEX/README X @cp FILES/CONVEX.MAKEFILE CONVEX/makefile X @date > CONVEX_DIR_MADE X! PTX_DIR_MADE: X @echo "Creating binary area..." X @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir PTX; cd PTX; tar -xf -) X @cp FILES/PTX.README PTX/README X X--- 119,125 ----- X @cp FILES/CONVEX.README CONVEX/README X @cp FILES/CONVEX.MAKEFILE CONVEX/makefile X @date > CONVEX_DIR_MADE X! DYNIX_DIR_MADE: X @echo "Creating binary area..." X @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir DYNIX; cd DYNIX; tar -xf -) X @cp FILES/DYNIX.README DYNIX/README X*************** X*** 121,130 X @date > CONVEX_DIR_MADE X PTX_DIR_MADE: X @echo "Creating binary area..." X! @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir PTX; cd PTX; tar -xf -) X! @cp FILES/PTX.README PTX/README X! @cp FILES/PTX.MAKEFILE PTX/makefile X! @date > PTX_DIR_MADE X X AIX-RS: AIX-RS_DIR_MADE AIX-RS_LAST_MAKE X cd AIX-RS; make; make install; date > AIX-RS_LAST_MAKE X X--- 121,130 ----- X @date > CONVEX_DIR_MADE X DYNIX_DIR_MADE: X @echo "Creating binary area..." X! @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir DYNIX; cd DYNIX; tar -xf -) X! @cp FILES/DYNIX.README DYNIX/README X! @cp FILES/DYNIX.MAKEFILE DYNIX/makefile X! @date > DYNIX_DIR_MADE X X AIX-RS: AIX-RS_DIR_MADE AIX-RS_LAST_MAKE X cd AIX-RS; make; make install; date > AIX-RS_LAST_MAKE X*************** X*** 160,167 X cd SUN4; make; make install; date > SUN4_LAST_MAKE X VAX: VAX_DIR_MADE VAX_LAST_MAKE X cd VAX; make; make install; date > VAX_LAST_MAKE X! PTX: PTX_DIR_MADE PTX_LAST_MAKE X! cd PTX; make; make install; date > PTX_LAST_MAKE X X AIX-RS_LAST_MAKE: X AIX-RT_LAST_MAKE: X X--- 160,167 ----- X cd SUN4; make; make install; date > SUN4_LAST_MAKE X VAX: VAX_DIR_MADE VAX_LAST_MAKE X cd VAX; make; make install; date > VAX_LAST_MAKE X! DYNIX: DYNIX_DIR_MADE DYNIX_LAST_MAKE X! cd DYNIX; make; make install; date > DYNIX_LAST_MAKE X X AIX-RS_LAST_MAKE: X AIX-RT_LAST_MAKE: X*************** X*** 181,184 X SUN4_LAST_MAKE: X VAX_LAST_MAKE: X CONVEX_LAST_MAKE: X! PTX_LAST_MAKE: X X--- 181,184 ----- X SUN4_LAST_MAKE: X VAX_LAST_MAKE: X CONVEX_LAST_MAKE: X! DYNIX_LAST_MAKE: XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//clib and isisv2.1//clib XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//demos and isisv2.1//demos XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//include and isisv2.1//include XOnly in isisv2.1/: mach XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man and isisv2.1//man XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//mlib and isisv2.1//mlib XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//protos and isisv2.1//protos XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//util and isisv2.1//util XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/bin and isisv2.1//BINARY-TEMPLATE/bin XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/clib and isisv2.1//BINARY-TEMPLATE/clib XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/demos and isisv2.1//BINARY-TEMPLATE/demos XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/lib and isisv2.1//BINARY-TEMPLATE/lib XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/mlib and isisv2.1//BINARY-TEMPLATE/mlib XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/protos and isisv2.1//BINARY-TEMPLATE/protos XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/run_demos and isisv2.1//BINARY-TEMPLATE/run_demos XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/run_isis and isisv2.1//BINARY-TEMPLATE/run_isis XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/util and isisv2.1//BINARY-TEMPLATE/util Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/clib/makefile isisv2.1//BINARY-TEMPLATE/clib/makefile X*** ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/clib/makefile Wed Sep 12 10:26:00 1990 X--- isisv2.1//BINARY-TEMPLATE/clib/makefile Mon Dec 3 12:44:57 1990 X*************** X*** 22,28 X allegro_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X lucid_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X X! libisis1.a: $(TKOFILES) X rm -f libisis1.a X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X--- 22,28 ----- X allegro_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X lucid_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X X! libisis1.a:$& $(TKOFILES) X rm -f libisis1.a X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X*************** X*** 27,33 X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X! libisis2.a: $(CLOFILES) $(DUOFILES) X rm -f libisis2.a X ar lruv libisis2.a $(CLOFILES) $(DUOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X--- 27,33 ----- X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X! libisis2.a:$& $(CLOFILES) $(DUOFILES) X rm -f libisis2.a X ar lruv libisis2.a $(CLOFILES) $(DUOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X*************** X*** 33,39 X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X isis_c_refs.o: $(S)/isis_c_refs.c; $(CC) -c $(CFLAGS) $(S)/isis_c_refs.c X! libisism.a: ../mlib/libisism.a X /bin/cp ../mlib/libisism.a libisism.a; X ar ld libisism.a msg_sa.o X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisism.a; fi X X--- 33,39 ----- X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X isis_c_refs.o: $(S)/isis_c_refs.c; $(CC) -c $(CFLAGS) $(S)/isis_c_refs.c X! libisism.a:$& ../mlib/libisism.a X /bin/cp ../mlib/libisism.a libisism.a; X ar ld libisism.a msg_sa.o X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisism.a; fi Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/demos/makefile isisv2.1//BINARY-TEMPLATE/demos/makefile X*** ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/demos/makefile Fri Sep 7 13:41:25 1990 X--- isisv2.1//BINARY-TEMPLATE/demos/makefile Thu Dec 13 13:50:09 1990 X*************** X*** 5,12 X DBGCFLAGS = $(MCHDEPCFLAGS) -D$(MCHTYPE) -I../../include -I$(S) -c -g X LDFLAGS = $(MCHDEPCFLAGS) X LIBS = ../clib/libisis1.a ../clib/libisis2.a ../mlib/libisism.a X! GRIDFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" OPTIM="$(OPTIM)" X! PMAKEFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" X X all: testtasks twenty qa testjoins silentjoins \ X bank teller selftest \ X X--- 5,12 ----- X DBGCFLAGS = $(MCHDEPCFLAGS) -D$(MCHTYPE) -I../../include -I$(S) -c -g X LDFLAGS = $(MCHDEPCFLAGS) X LIBS = ../clib/libisis1.a ../clib/libisis2.a ../mlib/libisism.a X! GRIDFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" OPTIM="$(OPTIM)" MCHTYPE="$(MCHTYPE)" X! PMAKEFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" MCHTYPE="$(MCHTYPE)" X X all: testtasks twenty qa testjoins silentjoins \ X bank teller selftest \ XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/demos/pmk and isisv2.1//BINARY-TEMPLATE/demos/pmk Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/mlib/makefile isisv2.1//BINARY-TEMPLATE/mlib/makefile X*** ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/mlib/makefile Fri Sep 7 13:41:13 1990 X--- isisv2.1//BINARY-TEMPLATE/mlib/makefile Mon Dec 3 12:45:32 1990 X*************** X*** 8,14 X X all: libisism.a X X! libisism.a: $(OFILES) X rm -f libisism.a X -$(S)/fix_mlib_for_gcc $(CC) X ar lr libisism.a $(OFILES) X X--- 8,14 ----- X X all: libisism.a X X! libisism.a:$& $(OFILES) X rm -f libisism.a X -$(S)/fix_mlib_for_gcc $(CC) X ar lr libisism.a $(OFILES) Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/protos/makefile isisv2.1//BINARY-TEMPLATE/protos/makefile X*** ../ISIS-VIRGIN/isisv2.1//BINARY-TEMPLATE/protos/makefile Tue Sep 18 05:38:24 1990 X--- isisv2.1//BINARY-TEMPLATE/protos/makefile Mon Dec 3 12:45:17 1990 X*************** X*** 22,28 X $(S)/pr_fdect.c $(S)/pr_watch.c $(S)/pr_viewlocks.c $(S)/pr_glocks.c \ X $(S)/pr_msgtank.c $(S)/history.c X X! protos: $(OFILES) ../mlib/libisism.a X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X X--- 22,28 ----- X $(S)/pr_fdect.c $(S)/pr_watch.c $(S)/pr_viewlocks.c $(S)/pr_glocks.c \ X $(S)/pr_msgtank.c $(S)/history.c X X! protos:$& $(OFILES) ../mlib/libisism.a X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X*************** X*** 26,32 X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X! protos.gprof: $(OFILES) ../mlib/libisism.a X $(CC) $(LFLAGS) -pg -o protos.gprof $(OFILES) $(LIBFILES) X X lint: X X--- 26,32 ----- X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X! protos.gprof:$& $(OFILES) ../mlib/libisism.a X $(CC) $(LFLAGS) -pg -o protos.gprof $(OFILES) $(LIBFILES) X X lint: Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//FILES/DYNIX.MAKEFILE isisv2.1//FILES/DYNIX.MAKEFILE X*** ../ISIS-VIRGIN/isisv2.1//FILES/DYNIX.MAKEFILE Thu Dec 13 14:46:59 1990 X--- isisv2.1//FILES/DYNIX.MAKEFILE Thu Dec 13 12:15:58 1990 X*************** X*** 0 X X--- 1,90 ----- X+ # $RCSfile: makefile,v $ $Revision: 1.5 $ $Date: 90/04/25 13:15:25 $ X+ SHELL = /bin/sh X+ MCH = MCHTYPE=DYNIX X+ X+ # The following are used to build a library with strtok() in it from X+ # the SVAE libc.a. X+ SVAEOBJS= strtok.o strpbrk.o strspn.o X+ SVAELIBC= /usr/att/lib/libc.a X+ # Change this to reflect your particular reality X+ STRTOKLIB= /usr/fubar/ISIS-PORT/isisv2.1/DYNIX/libstrtok/libstrtok.a X+ X+ MCHDEP = $(MCH) MCHDEPCFLAGS="" OPLIBS=${STRTOKLIB} X+ # Use the following line if you want to enable bypass communication mode. X+ #MCHDEP = $(MCH) MCHDEPCFLAGS="-DBYPASS" OPLIBS= X+ X+ # The following lines define useful sets of options for using either the X+ # gcc compiler or the standard C compiler on your system. X+ OPTIMSTD = CC=cc OPTIM="-O" X+ DEBUGSTD = CC=cc OPTIM="-g" X+ OPTIMGCC = CC=gcc OPTIM="-g -O" X+ DEBUGGCC = CC=gcc OPTIM="-g" X+ WARNGCC = CC=gcc OPTIM="-g -O -W" X+ WALLGCC = CC=gcc OPTIM="-g -Wall -O" X+ NOWARNGCC = CC=gcc OPTIM="-g -w -O" X+ X+ X+ all: readme mlib clib protos util demos X+ X+ libstrtok: libstrtok/libstrtok.a X+ X+ libstrtok/libstrtok.a: X+ -mkdir libstrtok X+ cd libstrtok; \ X+ /bin/ar vx ${SVAELIBC} ${SVAEOBJS}; \ X+ /bin/ar vr ./libstrtok.a ${SVAEOBJS}; \ X+ /usr/bin/ranlib ./libstrtok.a; X+ X+ readme: X+ @cat README X+ X+ protos: pr_action X+ clib: cl_action X+ mlib: ml_action X+ util: ut_action X+ demos: de_action X+ X+ pr_action: X+ cd protos; make $(MCHDEP) $(OPTIMSTD) ; cd .. X+ cl_action: X+ cd clib; make $(MCHDEP) $(OPTIMSTD) ; cd .. X+ ml_action: X+ cd mlib; make $(MCHDEP) $(OPTIMSTD) ; cd .. X+ ut_action: X+ cd util; make $(MCHDEP) $(OPTIMSTD) ; cd .. X+ de_action: X+ cd demos; make $(MCHDEP) $(OPTIMSTD) ; cd .. X+ X+ UTILPROGS = cmd isis lmgr news prstat rexec \ X+ rmgr rmgr_cmd spooler tabex xmgr X+ DEMOPROGS = bank fortran_test grid lh_sp_test lisp_test \ X+ qa selftest silentjoins sun_grid teller testjoins \ X+ testtasks twenty wanClient wanServer spread X+ X+ install: X+ (cd bin; /bin/rm -f protos $(UTILPROGS) $(DEMOPROGS) ) X+ - (cd demos/pmk; make install ) X+ ln protos/protos bin X+ (cd util; ln $(UTILPROGS) ../bin ) X+ - (cd demos; ln $(DEMOPROGS) ../bin ) X+ /bin/rm -f lib/libisis1.a lib/libisis2.a lib/libisism.a X+ ln clib/libisis1.a clib/libisis2.a mlib/libisism.a lib X+ X+ clean: X+ /bin/rm -f protos/*.[os] clib/*.[os] mlib/*.o util/*.o demos/*.o X+ /bin/rm -f util/cmd[ly].[ch] X+ /bin/rm -f libstrtok/*.o X+ - (cd demos/pmk; make clean ) X+ X+ realclean: clean X+ - (cd demos/pmk; make realclean ) X+ /bin/rm -f protos/protos X+ (cd util; /bin/rm -f $(UTILPROGS) ) X+ (cd demos; /bin/rm -f $(DEMOPROGS) ) X+ /bin/rm -f bin/* X+ /bin/rm -f clib/libisis1.a clib/libisis2.a mlib/libisism.a X+ /bin/rm -f lib/*.a X+ /bin/rm -f libstrtok/libstrtok.a X+ (cd run_demos; /bin/rm -f *.log core ) X+ (cd run_isis; /bin/rm -f *.log core ) X+ Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//FILES/DYNIX.README isisv2.1//FILES/DYNIX.README X*** ../ISIS-VIRGIN/isisv2.1//FILES/DYNIX.README Thu Dec 13 14:47:02 1990 X--- isisv2.1//FILES/DYNIX.README Thu Dec 13 12:40:38 1990 X*************** X*** 0 X X--- 1,47 ----- X+ How to enable BYPASS communication: X+ X+ Release 2.1 of ISIS provides the "BYPASS" communication mode which X+ can speed up multicast up to 10 times over normal ISIS multicasts. X+ To enable this, uncomment the appropriate line that defines the MCHDEP X+ compiler option, near the beginning of this makefile. X+ This will supply the -DBYPASS option to the compiler. X+ X+ Ken Birman X+ X+ ================ X+ X+ Running ISIS under DYNIX 3.0.17 will require that the user X+ supply the strtok() routine. If you have the SVAE (System V X+ Application Environment) installed, you can get this from the att X+ universe libc with the following: X+ X+ ar x /usr/att/lib/libc.a strtok.o strpbrk.o strspn.o X+ ar r ./libstrtok.a strtok.o strpbrk.o strspn.o X+ ranlib libstrtok.a X+ X+ You can do this automagically from the isisv2.1/DYNIX X+ directory with "make libstrtok," which will create a subdirectory X+ called "libstrtok" and put it there, assuming you have the SVAE libc X+ to copy from. You'll also want to change the LIBSTRTOK macro in X+ isisv2.1/DYNIX/makefile to reflect your particular reality. X+ X+ BTW, the strpbrk() and strspn() functions are not called X+ directly by ISIS, but are required by this implementation of strtok(). X+ ISIS only requires strtok() itself. X+ X+ The Makefiles have also had lots of "$&" tokens added in X+ appropriate places; this is the indication to Dynix make that the X+ target should be build in parallel. For versions of Dynix older than X+ 3.0.17, you'll probably have to add a "&=&" on some make invocations X+ to make it work properly. this isn't necessary, it just makes X+ compilation much faster. X+ X+ This port is only for the Symmetry (i386 based), the Balance X+ is not supported. It has been tested primarily under Dynix 3.0.17, X+ older versions may not work properly. If you want to run ISIS on a X+ Balance, you should only need to come up with the proper stuff for X+ pr_task.c and cl_task.c for the ns32000. X+ X+ -Jay Vosburgh, fubar@sequent.com X+ X+ Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//clib/cl_task.c isisv2.1//clib/cl_task.c X*** ../ISIS-VIRGIN/isisv2.1//clib/cl_task.c Thu Sep 13 19:40:08 1990 X--- isisv2.1//clib/cl_task.c Mon Dec 3 14:14:16 1990 X*************** X*** 18,24 X * -- Copyright (c) 1990, The ISIS PROJECT X */ X X! # include <string.h> X X # include "isis.h" X X X--- 18,28 ----- X * -- Copyright (c) 1990, The ISIS PROJECT X */ X X! #ifndef DYNIX X! #include <string.h> X! #else /* DYNIX */ X! #include <strings.h> X! #endif /* DYNIX */ X X # include "isis.h" X X*************** X*** 45,51 X X /* On some machine setjmp and longjmp work fine for ISIS */ X #ifndef THREADS X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X X--- 49,55 ----- X X /* On some machine setjmp and longjmp work fine for ISIS */ X #ifndef THREADS X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X*************** X*** 48,54 X # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # if (AIX) X # define isis_setjmp setjmp X # define isis_longjmp longjmp X X--- 52,58 ----- X # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # if (AIX) X # define isis_setjmp setjmp X # define isis_longjmp longjmp X*************** X*** 525,530 X } X } X # endif X invoke(); X goto out; X #endif THREADS X X--- 529,553 ----- X } X } X # endif X+ # if(DYNIX) X+ { X+ jmp_buf env; X+ int *envp; X+ X+ if (isis_setjmp(env) == 0) { X+ stackp = &tp->task_stack[STACKLEN-sizeof(jmp_buf)]; X+ stackp = (char *)((int)stackp & ~0x3); X+ #ifdef DB_TASKS X+ printf("cl_task:task_swtch: new stackp = 0x%x\n", stackp); X+ #endif X+ /* X+ * 4 is %esp, despite what <setjmp.h> suggests X+ */ X+ env[4] = (int)stackp; X+ isis_longjmp(env, 1); X+ } X+ } X+ # endif X invoke(); X goto out; X #endif THREADS Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//clib/makefile isisv2.1//clib/makefile X*** ../ISIS-VIRGIN/isisv2.1//clib/makefile Wed Sep 12 10:26:00 1990 X--- isisv2.1//clib/makefile Mon Dec 3 12:44:57 1990 X*************** X*** 22,28 X allegro_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X lucid_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X X! libisis1.a: $(TKOFILES) X rm -f libisis1.a X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X--- 22,28 ----- X allegro_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X lucid_clib: libisis1.a libisis2.a isis_c_refs.o libisism.a X X! libisis1.a:$& $(TKOFILES) X rm -f libisis1.a X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X*************** X*** 27,33 X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X! libisis2.a: $(CLOFILES) $(DUOFILES) X rm -f libisis2.a X ar lruv libisis2.a $(CLOFILES) $(DUOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X--- 27,33 ----- X ar lruv libisis1.a $(TKOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis1.a; fi X X! libisis2.a:$& $(CLOFILES) $(DUOFILES) X rm -f libisis2.a X ar lruv libisis2.a $(CLOFILES) $(DUOFILES) X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X*************** X*** 33,39 X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X isis_c_refs.o: $(S)/isis_c_refs.c; $(CC) -c $(CFLAGS) $(S)/isis_c_refs.c X! libisism.a: ../mlib/libisism.a X /bin/cp ../mlib/libisism.a libisism.a; X ar ld libisism.a msg_sa.o X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisism.a; fi X X--- 33,39 ----- X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisis2.a; fi X X isis_c_refs.o: $(S)/isis_c_refs.c; $(CC) -c $(CFLAGS) $(S)/isis_c_refs.c X! libisism.a:$& ../mlib/libisism.a X /bin/cp ../mlib/libisism.a libisism.a; X ar ld libisism.a msg_sa.o X -if test $(MCHTYPE) != HPUX -a $(MCHTYPE) != AIX -a $(MCHTYPE) != AUX ; then ranlib libisism.a; fi Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//clib/tk_long_haul.c isisv2.1//clib/tk_long_haul.c X*** ../ISIS-VIRGIN/isisv2.1//clib/tk_long_haul.c Fri Sep 7 13:42:24 1990 X--- isisv2.1//clib/tk_long_haul.c Mon Dec 3 15:16:21 1990 X*************** X*** 24,29 X #define IE_PARTICIPANTS_LIST -1111 X #define IE_SETNAME -2222 X X X char * X dirfilename(userpath, dir) X X--- 24,33 ----- X #define IE_PARTICIPANTS_LIST -1111 X #define IE_SETNAME -2222 X X+ #ifdef DYNIX X+ #define strrchr rindex X+ extern char *rindex(); X+ #endif X X char * X dirfilename(userpath, dir) Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//clib/tk_news.c isisv2.1//clib/tk_news.c X*** ../ISIS-VIRGIN/isisv2.1//clib/tk_news.c Fri Sep 7 13:42:25 1990 X--- isisv2.1//clib/tk_news.c Mon Dec 3 14:12:15 1990 X*************** X*** 25,30 X X #include "isis.h" X #include <stdio.h> X #include <string.h> X #include <sys/file.h> X X X--- 25,31 ----- X X #include "isis.h" X #include <stdio.h> X+ #ifndef DYNIX X #include <string.h> X #else /* DYNIX */ X #include <strings.h> X*************** X*** 26,31 X #include "isis.h" X #include <stdio.h> X #include <string.h> X #include <sys/file.h> X X extern sview *site_getview(); X X--- 27,35 ----- X #include <stdio.h> X #ifndef DYNIX X #include <string.h> X+ #else /* DYNIX */ X+ #include <strings.h> X+ #endif /* DYNIX */ X #include <sys/file.h> X X extern sview *site_getview(); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//clib/tk_rmgr.c isisv2.1//clib/tk_rmgr.c X*** ../ISIS-VIRGIN/isisv2.1//clib/tk_rmgr.c Fri Sep 7 13:42:26 1990 X--- isisv2.1//clib/tk_rmgr.c Mon Dec 3 13:05:07 1990 X*************** X*** 27,32 X */ X X #include <stdio.h> X #include <string.h> X #include <sys/types.h> X #ifndef GOULD X X--- 27,33 ----- X */ X X #include <stdio.h> X+ #ifndef DYNIX X #include <string.h> X #else /* DYNIX */ X #include <strings.h> X*************** X*** 28,33 X X #include <stdio.h> X #include <string.h> X #include <sys/types.h> X #ifndef GOULD X #include <fcntl.h> X X--- 29,37 ----- X #include <stdio.h> X #ifndef DYNIX X #include <string.h> X+ #else /* DYNIX */ X+ #include <strings.h> X+ #endif /* DYNIX */ X #include <sys/types.h> X #ifndef GOULD X #include <fcntl.h> Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/bank.c isisv2.1//demos/bank.c X*** ../ISIS-VIRGIN/isisv2.1//demos/bank.c Fri Sep 7 13:41:20 1990 X--- isisv2.1//demos/bank.c Mon Dec 3 15:09:19 1990 X*************** X*** 10,15 X X #include "isis.h" X #include "bank.h" X #include <string.h> X X #ifndef MACH X X--- 10,18 ----- X X #include "isis.h" X #include "bank.h" X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif X X*************** X*** 11,16 X #include "isis.h" X #include "bank.h" X #include <string.h> X X #ifndef MACH X char *malloc(); X X--- 14,20 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif X X #ifndef MACH X char *malloc(); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/display11.c isisv2.1//demos/display11.c X*** ../ISIS-VIRGIN/isisv2.1//demos/display11.c Sat Sep 15 17:36:05 1990 X--- isisv2.1//demos/display11.c Fri Dec 14 15:52:38 1990 X*************** X*** 37,42 X int stream = 0; X Window win; X X #include <string.h> X int gethostname(); X int XSetFont(), XStoreName(), XMapRaised(), XMoveWindow(), XSelectInput(); X X--- 37,45 ----- X int stream = 0; X Window win; X X+ #ifdef DYNIX X+ #include <strings.h> X+ #else /* DYNIX */ X #include <string.h> X #endif /* DYNIX */ X X*************** X*** 38,43 X Window win; X X #include <string.h> X int gethostname(); X int XSetFont(), XStoreName(), XMapRaised(), XMoveWindow(), XSelectInput(); X int XSetForeGround(), XFillRectangle(), XSetBackground(), XDrawImageString(); X X--- 41,48 ----- X #include <strings.h> X #else /* DYNIX */ X #include <string.h> X+ #endif /* DYNIX */ X+ X int gethostname(); X int XSetFont(), XStoreName(), XMapRaised(), XMoveWindow(), XSelectInput(); X int XSetForeGround(), XFillRectangle(), XSetBackground(), XDrawImageString(); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/lh_sp_test.c isisv2.1//demos/lh_sp_test.c X*** ../ISIS-VIRGIN/isisv2.1//demos/lh_sp_test.c Fri Sep 7 13:41:24 1990 X--- isisv2.1//demos/lh_sp_test.c Mon Dec 3 15:11:16 1990 X*************** X*** 21,26 X X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X--- 21,29 ----- X X #include <stdio.h> X #include <ctype.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif X #include "isis.h" X*************** X*** 22,27 X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X X--- 25,31 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif X #include "isis.h" X #include "spooler.h" X Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/lisp_test.c isisv2.1//demos/lisp_test.c X*** ../ISIS-VIRGIN/isisv2.1//demos/lisp_test.c Fri Sep 7 13:41:24 1990 X--- isisv2.1//demos/lisp_test.c Mon Dec 3 15:19:26 1990 X*************** X*** 1,5 X #include "isis.h" X #include <ctype.h> X #include <string.h> X int atoi(); X X X--- 1,8 ----- X #include "isis.h" X #include <ctype.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif X int atoi(); X*************** X*** 1,6 X #include "isis.h" X #include <ctype.h> X #include <string.h> X int atoi(); X X void X X--- 4,10 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif X int atoi(); X X void Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/makefile isisv2.1//demos/makefile X*** ../ISIS-VIRGIN/isisv2.1//demos/makefile Fri Sep 7 13:41:25 1990 X--- isisv2.1//demos/makefile Thu Dec 13 13:50:09 1990 X*************** X*** 5,12 X DBGCFLAGS = $(MCHDEPCFLAGS) -D$(MCHTYPE) -I../../include -I$(S) -c -g X LDFLAGS = $(MCHDEPCFLAGS) X LIBS = ../clib/libisis1.a ../clib/libisis2.a ../mlib/libisism.a X! GRIDFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" OPTIM="$(OPTIM)" X! PMAKEFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" X X all: testtasks twenty qa testjoins silentjoins \ X bank teller selftest \ X X--- 5,12 ----- X DBGCFLAGS = $(MCHDEPCFLAGS) -D$(MCHTYPE) -I../../include -I$(S) -c -g X LDFLAGS = $(MCHDEPCFLAGS) X LIBS = ../clib/libisis1.a ../clib/libisis2.a ../mlib/libisism.a X! GRIDFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" OPTIM="$(OPTIM)" MCHTYPE="$(MCHTYPE)" X! PMAKEFLAGS = MCHDEPCFLAGS="$(MCHDEPCFLAGS)" OPLIBS="$(OPLIBS)" MCHTYPE="$(MCHTYPE)" X X all: testtasks twenty qa testjoins silentjoins \ X bank teller selftest \ XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//demos/pmk and isisv2.1//demos/pmk Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/spread.c isisv2.1//demos/spread.c X*** ../ISIS-VIRGIN/isisv2.1//demos/spread.c Mon Sep 17 08:23:44 1990 X--- isisv2.1//demos/spread.c Thu Dec 13 14:15:25 1990 X*************** X*** 20,25 X #include "spread.h" X #include <signal.h> X #include <ctype.h> X #include <string.h> X #include <stdio.h> X X X--- 20,26 ----- X #include "spread.h" X #include <signal.h> X #include <ctype.h> X+ #ifndef DYNIX X #include <string.h> X #else /* DYNIX */ X #include <strings.h> X*************** X*** 21,26 X #include <signal.h> X #include <ctype.h> X #include <string.h> X #include <stdio.h> X X /* debug (synchronous) X mode switch, non-zero = on */ X X--- 22,30 ----- X #include <ctype.h> X #ifndef DYNIX X #include <string.h> X+ #else /* DYNIX */ X+ #include <strings.h> X+ #endif /* DYNIX */ X #include <stdio.h> X X /* debug (synchronous) X mode switch, non-zero = on */ Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/spreadparse.y isisv2.1//demos/spreadparse.y X*** ../ISIS-VIRGIN/isisv2.1//demos/spreadparse.y Mon Sep 17 09:49:26 1990 X--- isisv2.1//demos/spreadparse.y Thu Dec 13 14:21:27 1990 X*************** X*** 20,25 X #include "spread.h" X #include "isis.h" X X /* local variable to the pasrser */ X FILE *lfp; X char str[64]; X X--- 20,29 ----- X #include "spread.h" X #include "isis.h" X X+ #ifdef DYNIX X+ #define memset(a, b, c) bzero(a, c) X+ #endif X+ X /* local variable to the pasrser */ X FILE *lfp; X char str[64]; Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/teller.c isisv2.1//demos/teller.c X*** ../ISIS-VIRGIN/isisv2.1//demos/teller.c Fri Sep 7 13:41:30 1990 X--- isisv2.1//demos/teller.c Mon Dec 3 15:10:09 1990 X*************** X*** 1,6 X /* $RCSfile: teller.c,v $ $Revision: 2.9 $ $Date: 90/08/02 13:28:15 $ */ X #include "isis.h" X #include "bank.h" X #include <string.h> X #include <ctype.h> X X X--- 1,9 ----- X /* $RCSfile: teller.c,v $ $Revision: 2.9 $ $Date: 90/08/02 13:28:15 $ */ X #include "isis.h" X #include "bank.h" X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif /* DYNIX */ X #include <ctype.h> X*************** X*** 2,7 X #include "isis.h" X #include "bank.h" X #include <string.h> X #include <ctype.h> X X int port_nr = 0; /* ISIS port number */ X X--- 5,11 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif /* DYNIX */ X #include <ctype.h> X X int port_nr = 0; /* ISIS port number */ Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/wanClient.c isisv2.1//demos/wanClient.c X*** ../ISIS-VIRGIN/isisv2.1//demos/wanClient.c Fri Sep 7 13:41:32 1990 X--- isisv2.1//demos/wanClient.c Mon Dec 3 15:15:20 1990 X*************** X*** 12,17 X X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X--- 12,20 ----- X X #include <stdio.h> X #include <ctype.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif X #include "isis.h" X*************** X*** 13,18 X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X X--- 16,22 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif X #include "isis.h" X #include "spooler.h" X Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/wanServer.c isisv2.1//demos/wanServer.c X*** ../ISIS-VIRGIN/isisv2.1//demos/wanServer.c Fri Sep 7 13:41:33 1990 X--- isisv2.1//demos/wanServer.c Mon Dec 3 15:18:49 1990 X*************** X*** 12,17 X X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X--- 12,20 ----- X X #include <stdio.h> X #include <ctype.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif X #include "isis.h" X*************** X*** 13,18 X #include <stdio.h> X #include <ctype.h> X #include <string.h> X #include "isis.h" X #include "spooler.h" X X X--- 16,22 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif X #include "isis.h" X #include "spooler.h" X Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkexec.c isisv2.1//demos/pmk/pmkexec.c X*** ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkexec.c Mon Aug 27 11:03:58 1990 X--- isisv2.1//demos/pmk/pmkexec.c Fri Dec 14 16:01:09 1990 X*************** X*** 151,156 X #include <rpcsvc/rusers.h> X #include <pwd.h> X X /* lists of graph nodes, data items, and server descriptors */ X extern list_type servers,imports,step_list; X extern step_addr_type *step_addr; X X--- 151,161 ----- X #include <rpcsvc/rusers.h> X #include <pwd.h> X X+ #ifdef DYNIX X+ #define strchr index X+ extern char *index(); X+ #endif /* DYNIX */ X+ X /* lists of graph nodes, data items, and server descriptors */ X extern list_type servers,imports,step_list; X extern step_addr_type *step_addr; X*************** X*** 660,666 X X dbgp "transfer DAG\n" dbge; X /* generate the temp file */ X! #ifdef MACH X strcpy(fname, PMK_SCR); X strcpy(fname, "/stateXXXXXX"); X mktemp(fname); X X--- 665,671 ----- X X dbgp "transfer DAG\n" dbge; X /* generate the temp file */ X! #if defined(MACH) || defined(DYNIX) X strcpy(fname, PMK_SCR); X strcpy(fname, "/stateXXXXXX"); X mktemp(fname); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkgph.c isisv2.1//demos/pmk/pmkgph.c X*** ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkgph.c Tue Jul 31 13:18:13 1990 X--- isisv2.1//demos/pmk/pmkgph.c Fri Dec 14 15:56:12 1990 X*************** X*** 51,56 X #if defined(HPUX) X char *strcpy(); X #else X #include <string.h> X #endif X #include <stdio.h> X X--- 51,59 ----- X #if defined(HPUX) X char *strcpy(); X #else X+ #ifdef DYNIX X+ #include <strings.h> X+ #else /* DYNIX */ X #include <string.h> X #endif /* DYNIX */ X #endif X*************** X*** 52,57 X char *strcpy(); X #else X #include <string.h> X #endif X #include <stdio.h> X X X--- 55,61 ----- X #include <strings.h> X #else /* DYNIX */ X #include <string.h> X+ #endif /* DYNIX */ X #endif X #include <stdio.h> X Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkio.c isisv2.1//demos/pmk/pmkio.c X*** ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmkio.c Mon Aug 27 11:03:28 1990 X--- isisv2.1//demos/pmk/pmkio.c Fri Dec 14 15:57:38 1990 X*************** X*** 18,23 X #if defined(HPUX) X char *strcpy(), *strcat(); X #else X #include <string.h> X #endif X X X--- 18,26 ----- X #if defined(HPUX) X char *strcpy(), *strcat(); X #else X+ #ifdef DYNIX X+ #include <strings.h> X+ #else /* DYNIX */ X #include <string.h> X #endif /* DYNIX */ X #endif X*************** X*** 19,24 X char *strcpy(), *strcat(); X #else X #include <string.h> X #endif X X extern list_type data_list,step_list,imports,servers; X X--- 22,28 ----- X #include <strings.h> X #else /* DYNIX */ X #include <string.h> X+ #endif /* DYNIX */ X #endif X X extern list_type data_list,step_list,imports,servers; Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmklib.c isisv2.1//demos/pmk/pmklib.c X*** ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmklib.c Tue Jul 31 13:18:31 1990 X--- isisv2.1//demos/pmk/pmklib.c Mon Dec 3 15:23:03 1990 X*************** X*** 90,95 X #include <sys/types.h> X #include <sys/stat.h> X #include <stdio.h> X #include <string.h> X X #include <pmkdat.h> X X--- 90,98 ----- X #include <sys/types.h> X #include <sys/stat.h> X #include <stdio.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else /* DYNIX */ X #include <string.h> X #endif /* DYNIX */ X X*************** X*** 91,96 X #include <sys/stat.h> X #include <stdio.h> X #include <string.h> X X #include <pmkdat.h> X X X--- 94,100 ----- X #include <strings.h> X #else /* DYNIX */ X #include <string.h> X+ #endif /* DYNIX */ X X #include <pmkdat.h> X X*************** X*** 93,98 X #include <string.h> X X #include <pmkdat.h> X X #define UNIT_TIME 5000 /* number of milliseconds for unrecog. cmd. */ X X X--- 97,107 ----- X #endif /* DYNIX */ X X #include <pmkdat.h> X+ X+ #ifdef DYNIX X+ #define strrchr rindex X+ extern char *rindex(); X+ #endif /* DYNIX */ X X #define UNIT_TIME 5000 /* number of milliseconds for unrecog. cmd. */ X Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmksched6.c isisv2.1//demos/pmk/pmksched6.c X*** ../ISIS-VIRGIN/isisv2.1//demos/pmk/pmksched6.c Tue Jul 31 13:18:41 1990 X--- isisv2.1//demos/pmk/pmksched6.c Fri Dec 14 15:59:03 1990 X*************** X*** 17,22 X #include <fcntl.h> X #include <signal.h> X #if !defined(HPUX) X #include <string.h> X #endif X #include <stdio.h> X X--- 17,25 ----- X #include <fcntl.h> X #include <signal.h> X #if !defined(HPUX) X+ #ifdef DYNIX X+ #include <strings.h> X+ #else /* DYNIX */ X #include <string.h> X #endif /* DYNIX */ X #endif X*************** X*** 18,23 X #include <signal.h> X #if !defined(HPUX) X #include <string.h> X #endif X #include <stdio.h> X X X--- 21,27 ----- X #include <strings.h> X #else /* DYNIX */ X #include <string.h> X+ #endif /* DYNIX */ X #endif X #include <stdio.h> X XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/cat1 and isisv2.1//man/cat1 XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/cat3 and isisv2.1//man/cat3 XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/cat5 and isisv2.1//man/cat5 XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/man1 and isisv2.1//man/man1 XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/man3 and isisv2.1//man/man3 XCommon subdirectories: ../ISIS-VIRGIN/isisv2.1//man/man5 and isisv2.1//man/man5 Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//mlib/makefile isisv2.1//mlib/makefile X*** ../ISIS-VIRGIN/isisv2.1//mlib/makefile Fri Sep 7 13:41:13 1990 X--- isisv2.1//mlib/makefile Mon Dec 3 12:45:32 1990 X*************** X*** 8,14 X X all: libisism.a X X! libisism.a: $(OFILES) X rm -f libisism.a X -$(S)/fix_mlib_for_gcc $(CC) X ar lr libisism.a $(OFILES) X X--- 8,14 ----- X X all: libisism.a X X! libisism.a:$& $(OFILES) X rm -f libisism.a X -$(S)/fix_mlib_for_gcc $(CC) X ar lr libisism.a $(OFILES) Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//protos/makefile isisv2.1//protos/makefile X*** ../ISIS-VIRGIN/isisv2.1//protos/makefile Tue Sep 18 05:38:24 1990 X--- isisv2.1//protos/makefile Mon Dec 3 12:45:17 1990 X*************** X*** 22,28 X $(S)/pr_fdect.c $(S)/pr_watch.c $(S)/pr_viewlocks.c $(S)/pr_glocks.c \ X $(S)/pr_msgtank.c $(S)/history.c X X! protos: $(OFILES) ../mlib/libisism.a X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X X--- 22,28 ----- X $(S)/pr_fdect.c $(S)/pr_watch.c $(S)/pr_viewlocks.c $(S)/pr_glocks.c \ X $(S)/pr_msgtank.c $(S)/history.c X X! protos:$& $(OFILES) ../mlib/libisism.a X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X*************** X*** 26,32 X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X! protos.gprof: $(OFILES) ../mlib/libisism.a X $(CC) $(LFLAGS) -pg -o protos.gprof $(OFILES) $(LIBFILES) X X lint: X X--- 26,32 ----- X /bin/rm -f protos X $(CC) $(LFLAGS) -o protos $(OFILES) $(LIBFILES) X X! protos.gprof:$& $(OFILES) ../mlib/libisism.a X $(CC) $(LFLAGS) -pg -o protos.gprof $(OFILES) $(LIBFILES) X X lint: Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//protos/pr_main.c isisv2.1//protos/pr_main.c X*** ../ISIS-VIRGIN/isisv2.1//protos/pr_main.c Fri Sep 7 13:41:00 1990 X--- isisv2.1//protos/pr_main.c Mon Dec 3 12:47:31 1990 X*************** X*** 38,43 X X static char my_full_name[64]; X #define GETHOSTTIMEOUT 5 X char *strchr(); X X static restartchk() X X--- 38,47 ----- X X static char my_full_name[64]; X #define GETHOSTTIMEOUT 5 X+ #ifdef DYNIX X+ #define strchr index X+ char *index(); X+ #else X char *strchr(); X #endif /* DYNIX */ X X*************** X*** 39,44 X static char my_full_name[64]; X #define GETHOSTTIMEOUT 5 X char *strchr(); X X static restartchk() X { X X--- 43,49 ----- X char *index(); X #else X char *strchr(); X+ #endif /* DYNIX */ X X static restartchk() X { X*************** X*** 87,92 X register i; X struct hostent *my_hep; X X for(i = 0; i < MAXBITS; i++) X bis(&ones, i); X gethostname(my_host, 64); X X--- 92,105 ----- X register i; X struct hostent *my_hep; X X+ #ifdef DYNIX X+ if (-1 == setdtablesize(64)) { X+ perror("setdtablesize(64)"); X+ /* this isn't fatal, but you won't have more X+ * than 20 file descriptors available X+ */ X+ } X+ #endif /* DYNIX */ X for(i = 0; i < MAXBITS; i++) X bis(&ones, i); X gethostname(my_host, 64); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//protos/pr_task.c isisv2.1//protos/pr_task.c X*** ../ISIS-VIRGIN/isisv2.1//protos/pr_task.c Wed Sep 12 10:28:00 1990 X--- isisv2.1//protos/pr_task.c Mon Dec 3 12:47:06 1990 X*************** X*** 22,27 X */ X X # include <stdio.h> X # include <string.h> X X # include "pr.h" X X--- 22,30 ----- X */ X X # include <stdio.h> X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X # include <string.h> X #endif /* DYNIX */ X X*************** X*** 23,28 X X # include <stdio.h> X # include <string.h> X X # include "pr.h" X X X--- 26,32 ----- X #include <strings.h> X #else X # include <string.h> X+ #endif /* DYNIX */ X X # include "pr.h" X X*************** X*** 28,34 X X /* On some machine setjmp and longjmp work fine for ISIS */ X #ifndef THREADS X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X X--- 32,38 ----- X X /* On some machine setjmp and longjmp work fine for ISIS */ X #ifndef THREADS X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X*************** X*** 31,37 X # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX) X # if (AIX) X # define isis_setjmp setjmp X # define isis_longjmp longjmp X X--- 35,41 ----- X # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # define isis_setjmp _setjmp X # define isis_longjmp _longjmp X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|DYNIX) X # if (AIX) X # define isis_setjmp setjmp X # define isis_longjmp longjmp X*************** X*** 327,332 X } X } X # endif X invoke(); /* No return */ X #endif THREADS X } X X--- 331,356 ----- X } X } X # endif X+ # if(DYNIX) X+ { X+ jmp_buf env; X+ int *envp; X+ X+ if (isis_setjmp(env) == 0) { X+ stackp = &tp->task_stack[STACKLEN-sizeof(jmp_buf)]; X+ stackp = (char *)((int)stackp & ~0x3); X+ #ifdef DB_TASKS X+ printf("pr_task:task_swtch: new stackp = 0x%x\n", stackp); X+ #endif X+ /* X+ * 4 is %esp, despite what <setjmp.h> suggests X+ */ X+ env[4] = (int)stackp; X+ isis_longjmp(env, 1); X+ } X+ } X+ # endif X+ X invoke(); /* No return */ X #endif THREADS X } Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//util/isis.c isisv2.1//util/isis.c X*** ../ISIS-VIRGIN/isisv2.1//util/isis.c Fri Sep 7 13:40:33 1990 X--- isisv2.1//util/isis.c Mon Dec 3 14:47:38 1990 X*************** X*** 37,42 X # include <fcntl.h> X # include <signal.h> X X #define NCHILD 10 X #define NRETRY 2 X #define GETHOSTTIMEOUT 5 X X--- 37,47 ----- X # include <fcntl.h> X # include <signal.h> X X+ #ifdef DYNIX X+ #define strchr index X+ extern char *index(); X+ #endif X+ X #define NCHILD 10 X #define NRETRY 2 X #define GETHOSTTIMEOUT 5 Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//util/lmgr.c isisv2.1//util/lmgr.c X*** ../ISIS-VIRGIN/isisv2.1//util/lmgr.c Fri Sep 7 13:40:34 1990 X--- isisv2.1//util/lmgr.c Mon Dec 3 15:06:02 1990 X*************** X*** 20,25 X #include <sys/stat.h> X #include <stdio.h> X #include <sys/errno.h> X #include <dirent.h> X #include "isis.h" X X X--- 20,29 ----- X #include <sys/stat.h> X #include <stdio.h> X #include <sys/errno.h> X+ #ifdef DYNIX X+ #include <sys/dir.h> X+ #define dirent direct X+ #else X #include <dirent.h> X #endif /* DYNIX */ X #include "isis.h" X*************** X*** 21,26 X #include <stdio.h> X #include <sys/errno.h> X #include <dirent.h> X #include "isis.h" X X /* By not replying, leave /bin/xmgr hung until /bin/lmgr exits */ X X--- 25,31 ----- X #define dirent direct X #else X #include <dirent.h> X+ #endif /* DYNIX */ X #include "isis.h" X X /* By not replying, leave /bin/xmgr hung until /bin/lmgr exits */ Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//util/long_haul.c isisv2.1//util/long_haul.c X*** ../ISIS-VIRGIN/isisv2.1//util/long_haul.c Mon Sep 17 06:11:30 1990 X--- isisv2.1//util/long_haul.c Mon Dec 3 15:03:33 1990 X*************** X*** 18,23 X */ X X #define ISIS_SYS X #include <string.h> X #include "isis.h" X #include "spooler.h" X X--- 18,26 ----- X */ X X #define ISIS_SYS X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif /* DYNIX */ X #include "isis.h" X*************** X*** 19,24 X X #define ISIS_SYS X #include <string.h> X #include "isis.h" X #include "spooler.h" X #include "long_haul.h" X X--- 22,28 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif /* DYNIX */ X #include "isis.h" X #include "spooler.h" X #include "long_haul.h" X*************** X*** 23,28 X #include "spooler.h" X #include "long_haul.h" X X /*************************************************************************************** X * LONG HAUL GLOBAL VARIABLES X ***************************************************************************************/ X X--- 27,38 ----- X #include "spooler.h" X #include "long_haul.h" X X+ #ifdef DYNIX X+ #define strchr index X+ #define strrchr rindex X+ extern char *index(), *rindex(); X+ #endif X+ X /*************************************************************************************** X * LONG HAUL GLOBAL VARIABLES X ***************************************************************************************/ X*************** X*** 2660,2666 X struct sockaddr *addr; X int *addrlen; X { X! int i, j=*addrlen; X again: X *addrlen = j; X i = accept(s, addr, addrlen); X X--- 2670,2676 ----- X struct sockaddr *addr; X int *addrlen; X { X! int i, j= *addrlen; X again: X *addrlen = j; X i = accept(s, addr, addrlen); Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//util/rexec.c isisv2.1//util/rexec.c X*** ../ISIS-VIRGIN/isisv2.1//util/rexec.c Fri Sep 7 13:40:37 1990 X--- isisv2.1//util/rexec.c Mon Dec 3 14:52:22 1990 X*************** X*** 18,23 X char rexec_rcsid[] = "$Revision: 2.16 $$Date: 90/08/07 16:05:42 $$Source: /usr/fsys/isisfsys/b/isis/isisv2.1/util/RCS/rexec.c,v $"; X #include "isis.h" X #include "rexec.h" X #include "string.h" X #include <errno.h> X #include <pwd.h> X X--- 18,26 ----- X char rexec_rcsid[] = "$Revision: 2.16 $$Date: 90/08/07 16:05:42 $$Source: /usr/fsys/isisfsys/b/isis/isisv2.1/util/RCS/rexec.c,v $"; X #include "isis.h" X #include "rexec.h" X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include "string.h" X #endif /* DYNIX */ X #include <errno.h> X*************** X*** 19,24 X #include "isis.h" X #include "rexec.h" X #include "string.h" X #include <errno.h> X #include <pwd.h> X #include <sys/param.h> X X--- 22,28 ----- X #include <strings.h> X #else X #include "string.h" X+ #endif /* DYNIX */ X #include <errno.h> X #include <pwd.h> X #include <sys/param.h> Xdiff -r -c ../ISIS-VIRGIN/isisv2.1//util/spooler.c isisv2.1//util/spooler.c X*** ../ISIS-VIRGIN/isisv2.1//util/spooler.c Fri Sep 7 13:40:39 1990 X--- isisv2.1//util/spooler.c Mon Dec 3 15:02:26 1990 X*************** X*** 17,22 X X #include "isis.h" X #include "spooler.h" X #include <string.h> X #include <ctype.h> X #include <sys/file.h> X X--- 17,25 ----- X X #include "isis.h" X #include "spooler.h" X+ #ifdef DYNIX X+ #include <strings.h> X+ #else X #include <string.h> X #endif /* DYNIX */ X #include <ctype.h> X*************** X*** 18,23 X #include "isis.h" X #include "spooler.h" X #include <string.h> X #include <ctype.h> X #include <sys/file.h> X #ifdef HPUX X X--- 21,27 ----- X #include <strings.h> X #else X #include <string.h> X+ #endif /* DYNIX */ X #include <ctype.h> X #include <sys/file.h> X #ifdef HPUX SHAR_EOF if test 47240 -ne "`wc -c 'ISIS-DIFFS-DYNIX'`" then echo shar: error transmitting "'ISIS-DIFFS-DYNIX'" '(should have been 47240 characters)' fi # End of shell archive exit 0