wht@n4hgf.Mt-Park.GA.US (01/12/91)
Submitted-by: wht@n4hgf.Mt-Park.GA.US
Posting-number: Volume 16, Issue 70
Archive-name: ecu3/patch02a
Patch-To: ecu3: Volume 16, Issue 25-59
ECU 3.0 PATCH # 2 - Non-ansi/ISC
1. Fix non-curses per-file transfer rate report
(it was verrrrry optimistic :-)
2. Add experimental support for ISC 2.2
Note: if you are purely an SCO multiscreen user, you may wish to
save this patch and not apply it until further patches are issued.
By doing so, you will save an unnecessary compilation.
When another patch comes along, you must then apply this one so
that your source will be in sync.
#!/bin/sh
# This is ecu3/patch2, a shell archive (shar 3.46)
# made 01/10/1991 09:30 UTC by wht@n4hgf.Mt-Park.GA.US
# Source directory /u1/src/ecu
#
# existing files WILL be overwritten
#
# This shar contains:
# length mode name
# ------ ---------- ------------------------------------------
# 31013 -rw-r--r-- PATCH02.01
# 28027 -rw-r--r-- PATCH02.02
# 997 -rw-r--r-- ecunumrev.c
# 538 -rw-r--r-- ecuvmin.h
# 21 -rw-r--r-- patchlevel.h
#
# ============= PATCH02.01 ==============
echo 'x - extracting PATCH02.01 (Text)'
sed 's/^X//' << 'SHAR_EOF' > 'PATCH02.01' &&
X:
X#+-------------------------------------------------------------------------
X# ECU 3.0 PATCH # 2 Part 1/2 - Non-ansi/ISC
X#
X# 1. Fix non-curses per-file transfer rate report
X# (it was verrrrry optimistic :-)
X#
X# 2. Add experimental support for ISC 2.2
X#
X# Note: if you are purely an SCO multiscreen user, you may wish to
X# save this patch and not apply it until further patches are issued.
X# By doing so, you will save an unnecessary compilation.
X# When another patch comes along, you must then apply this one so
X# that your source will be in sync.
X#
X# created by gendiff x1.03 on 10 Jan 1991 09:07 UTC
X#-------------------------------------------------------
X*** /u4/src/ecu3.01/Make.ecu Wed Dec 26 05:26:00 1990
X--- Make.ecu Wed Jan 9 20:51:26 1991
X***************
X*** 11,17
X # su root (necessary)
X # make install
X #--------------------------------------------------------------------
X! # NOTE: under UNIX, cc defines both M_UNIX and M_XENIX. ecu.h and
X # sysdep.c remove M_XENIX under UNIX makes so that it is defined
X # only on XENIX systems. Nevertheless, every effort is made to
X # use M_UNIX over M_XENIX in code so that this feature is not
X
X--- 11,17 -----
X # su root (necessary)
X # make install
X #--------------------------------------------------------------------
X! # NOTE: under SCO UNIX, cc defines both M_UNIX and M_XENIX. ecu.h and
X # sysdep.c remove M_XENIX under UNIX makes so that it is defined
X # only on XENIX systems. Nevertheless, every effort is made to
X # use M_UNIX over M_XENIX in code so that this feature is not
X***************
X*** 18,25
X # counted on too much.
X #
X # If you are not using cc, be sure to define in CFLAGS
X! # M_UNIX for UNIX
X! # M_XENIX for XENIX (alone)
X # M_I86 for every target
X # M_I286 for 286 targets
X # M_I386 for 386 targets
X
X--- 18,26 -----
X # counted on too much.
X #
X # If you are not using cc, be sure to define in CFLAGS
X! # M_UNIX for SCO UNIX
X! # M_XENIX for SCO XENIX (alone)
X! # M_SYSV for any SCO (SCO ONLY: this is the prime differentiation tool)
X # M_I86 for every target
X # M_I286 for 286 targets (SCO XENIX ONLY)
X # M_I386 for 386 targets
X***************
X*** 21,27
X # M_UNIX for UNIX
X # M_XENIX for XENIX (alone)
X # M_I86 for every target
X! # M_I286 for 286 targets
X # M_I386 for 386 targets
X #
X # This list may be incomplete and the header files and this code make
X
X--- 22,28 -----
X # M_XENIX for SCO XENIX (alone)
X # M_SYSV for any SCO (SCO ONLY: this is the prime differentiation tool)
X # M_I86 for every target
X! # M_I286 for 286 targets (SCO XENIX ONLY)
X # M_I386 for 386 targets
X # __GNUC__ for GNU C (only 386 UNIX has even been tried)
X # ISC for ISC
X***************
X*** 23,28
X # M_I86 for every target
X # M_I286 for 286 targets
X # M_I386 for 386 targets
X #
X # This list may be incomplete and the header files and this code make
X # free use of the excellent SCO cc-provided #defines, so you may lose
X
X--- 24,32 -----
X # M_I86 for every target
X # M_I286 for 286 targets (SCO XENIX ONLY)
X # M_I386 for 386 targets
X+ # __GNUC__ for GNU C (only 386 UNIX has even been tried)
X+ # ISC for ISC
X+ # ISC22 for ISC 2.2 (this is the only version that has been tried)
X #
X # This list may be incomplete and the header files and this code make
X # free use of the excellent SCO cc-provided #defines, so you may lose
X***************
X*** 34,42
X # e.g. strcpy(str1,strarray[x+1]);
X #--------------------------------------------------------------------
X # VERY IMPORTANT: This make file has the ability to remake
X! # lint_args.h by 'make lint'' ... but don't do it on a UNIX system
X! # since MSC 5 -Zg has been broken since forever and cannot do the
X! # job .... it works OK on XENIX systems .... if you plan to remake
X # lint_args.h, please do squirrel away the release copy first
X #--------------------------------------------------------------------
X #+:EDITS:
X
X--- 38,47 -----
X # e.g. strcpy(str1,strarray[x+1]);
X #--------------------------------------------------------------------
X # VERY IMPORTANT: This make file has the ability to remake
X! # lint_args.h by 'make lint'' ... but don't do it on other than an
X! # SCO XENIX/386 system since Microsoft C 4.x is needed;
X! # since MSC 5 (SCO UNIX) -Zg has been broken since forever and
X! # cannot do the job .... if you do try to remake
X # lint_args.h, please do squirrel away the release copy first
X #--------------------------------------------------------------------
X #+:EDITS:
X***************
X*** 40,45
X # lint_args.h, please do squirrel away the release copy first
X #--------------------------------------------------------------------
X #+:EDITS:
X #:11-28-1990-19:45-wht@n4hgf-improve M_ dependency description
X #:10-20-1990-14:30-wht@n4hgf-fix bugs found by tbetz@upaya
X #:08-14-1990-20:42-wht@n4hgf-ecu3.00-flush old edit history
X
X--- 45,51 -----
X # lint_args.h, please do squirrel away the release copy first
X #--------------------------------------------------------------------
X #+:EDITS:
X+ #:01-08-1991-03:26-wht@n4hgf-add ISC support
X #:11-28-1990-19:45-wht@n4hgf-improve M_ dependency description
X #:10-20-1990-14:30-wht@n4hgf-fix bugs found by tbetz@upaya
X #:08-14-1990-20:42-wht@n4hgf-ecu3.00-flush old edit history
X***************
X*** 54,59
X # IF YOU CHANGE IT, ALSO CHANGE IT IN ecu.h
X ECULIBDIR = /usr/local/lib/ecu
X
X #--> leave commented unless you have my morse speaker driver
X #MORSE=-DMORSE
X
X
X--- 60,68 -----
X # IF YOU CHANGE IT, ALSO CHANGE IT IN ecu.h
X ECULIBDIR = /usr/local/lib/ecu
X
X+ #--> leave commented unless you are making for ISC 2.2
X+ #ISC = -DISC -DISC22 -O
X+
X #--> leave commented unless you have my morse speaker driver
X #MORSE=-DMORSE
X
X***************
X*** 68,74
X # 2.3.1 has a broken one that may be fixable: see README; 2.3.2
X # has a working select(S) for serial lines and a fix from SCO
X # for pipes [ecu doesn't select() on pipes])
X! # This is ignored for UNIX, where select(S) works fine
X NOSEL=-DNO_SELECT
X
X #--> comment out if you do not want the automatic procedure execution
X
X--- 77,83 -----
X # 2.3.1 has a broken one that may be fixable: see README; 2.3.2
X # has a working select(S) for serial lines and a fix from SCO
X # for pipes [ecu doesn't select() on pipes])
X! # This is ignored for SCO UNIX and ISC, where select(S) works fine
X NOSEL=-DNO_SELECT
X
X #--> comment out if you do not want the automatic procedure execution
X***************
X*** 76,82
X ADPROC=-DAUTO_DIAL_PROC
X
X #--> uncomment out if you want source-level debugging information
X! # (386 only)
X #ZI=-Zi
X #--------------------------------------------------------------------
X
X
X--- 85,91 -----
X ADPROC=-DAUTO_DIAL_PROC
X
X #--> uncomment out if you want source-level debugging information
X! # (SCO UNIX and XENIX 386 only); try -g for ISC
X #ZI=-Zi
X #--------------------------------------------------------------------
X
X***************
X*** 81,87
X #--------------------------------------------------------------------
X
X #make some composites based on above
X! SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286`
X U3C = $(ZI) -Octl -CSON
X X3C = $(ZI) -Ot -CSON
X X2C = -M2let32 -LARGE -F 8000 -Ot
X
X--- 90,96 -----
X #--------------------------------------------------------------------
X
X #make some composites based on above
X! SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286 =ISC ISC`
X U3C = $(ZI) -Octl -CSON
X X3C = $(ZI) -Ot -CSON -i
X X2C = -M2let32 -LARGE -F 8000 -Ot -i
X***************
X*** 83,90
X #make some composites based on above
X SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286`
X U3C = $(ZI) -Octl -CSON
X! X3C = $(ZI) -Ot -CSON
X! X2C = -M2let32 -LARGE -F 8000 -Ot
X CURSES = -DM_TERMCAP
X CURSES_LIB = -ltcap -ltermlib
X COMFLAGS = -i `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C)`
X
X--- 92,99 -----
X #make some composites based on above
X SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286 =ISC ISC`
X U3C = $(ZI) -Octl -CSON
X! X3C = $(ZI) -Ot -CSON -i
X! X2C = -M2let32 -LARGE -F 8000 -Ot -i
X CURSES = -DM_TERMCAP
X CURSES_LIB = -ltcap -ltermlib
X COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
X***************
X*** 87,93
X X2C = -M2let32 -LARGE -F 8000 -Ot
X CURSES = -DM_TERMCAP
X CURSES_LIB = -ltcap -ltermlib
X! COMFLAGS = -i `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C)`
X CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
X LDFLAGS = `sysdep =M_I386 =M_I286 -SEG 256` -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X
X
X--- 96,102 -----
X X2C = -M2let32 -LARGE -F 8000 -Ot -i
X CURSES = -DM_TERMCAP
X CURSES_LIB = -ltcap -ltermlib
X! COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
X CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
X LDSYS = `sysdep =ISC =M_I386 =M_I286 -SEG 256`
X LDFLAGS = $(LDSYS) -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X***************
X*** 89,95
X CURSES_LIB = -ltcap -ltermlib
X COMFLAGS = -i `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C)`
X CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
X! LDFLAGS = `sysdep =M_I386 =M_I286 -SEG 256` -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X
X ECUSHARNAME=ecux3
X MANSHARNAME=ecumanx3
X
X--- 98,105 -----
X CURSES_LIB = -ltcap -ltermlib
X COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
X CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
X! LDSYS = `sysdep =ISC =M_I386 =M_I286 -SEG 256`
X! LDFLAGS = $(LDSYS) -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X
X ECUSHARNAME=ecu3
X MANSHARNAME=ecuman3
X***************
X*** 91,98
X CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
X LDFLAGS = `sysdep =M_I386 =M_I286 -SEG 256` -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X
X! ECUSHARNAME=ecux3
X! MANSHARNAME=ecumanx3
X
X .SUFFIXES:
X .SUFFIXES: .o .c .h .l
X
X--- 101,108 -----
X LDSYS = `sysdep =ISC =M_I386 =M_I286 -SEG 256`
X LDFLAGS = $(LDSYS) -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
X
X! ECUSHARNAME=ecu3
X! MANSHARNAME=ecuman3
X
X .SUFFIXES:
X .SUFFIXES: .o .c .h .l
X***************
X*** 102,107
X
X SHARFLS = \
X README \
X ANCIENTHISTORY \
X ESOTERIC \
X Makefile *.c *.h \
X
X--- 112,118 -----
X
X SHARFLS = \
X README \
X+ README.NONSCO \
X ANCIENTHISTORY \
X ESOTERIC \
X Makefile *.c *.h \
X***************
X*** 299,305
X -n$(MANSHARNAME) -L55 -o/tmp/$(MANSHARNAME) doc/ecu.man
X
X # tools for making ecu
X! $(LBIN)/sysdep: sysdep.c # uname -p undocumented on UNIX but works
X @echo 'building sysdep for' `uname -p`
X [ `uname -p` != i80286 ] || $(CC) -O -M2 sysdep.c -o $@
X [ `uname -p` = i80286 ] || $(CC) -O sysdep.c -o $@
X
X--- 310,316 -----
X -n$(MANSHARNAME) -L55 -o/tmp/$(MANSHARNAME) doc/ecu.man
X
X # tools for making ecu
X! $(LBIN)/sysdep: sysdep.c # uname -m undocumented on UNIX but works
X @echo 'building sysdep for' `uname -p`
X [ `uname -m` != i80286 ] || $(CC) -O -M2 sysdep.c -o $@
X [ `uname -m` = i80286 ] || $(CC) -O $(NONSCO) sysdep.c -o $@
X***************
X*** 301,308
X # tools for making ecu
X $(LBIN)/sysdep: sysdep.c # uname -p undocumented on UNIX but works
X @echo 'building sysdep for' `uname -p`
X! [ `uname -p` != i80286 ] || $(CC) -O -M2 sysdep.c -o $@
X! [ `uname -p` = i80286 ] || $(CC) -O sysdep.c -o $@
X
X $(LBIN)/afterlint: afterlint.c
X $(CC) -O afterlint.c -o $@
X
X--- 312,319 -----
X # tools for making ecu
X $(LBIN)/sysdep: sysdep.c # uname -m undocumented on UNIX but works
X @echo 'building sysdep for' `uname -p`
X! [ `uname -m` != i80286 ] || $(CC) -O -M2 sysdep.c -o $@
X! [ `uname -m` = i80286 ] || $(CC) -O $(NONSCO) sysdep.c -o $@
X
X $(LBIN)/afterlint: afterlint.c
X $(CC) -O afterlint.c -o $@
X*** /u4/src/ecu3.01/README Wed Dec 26 04:38:00 1990
X--- README Thu Jan 10 04:06:06 1991
X***************
X*** 1,5
X .--------------------------------------------------------.
X! | ECU README - last revised Sat Dec 22 00:10:12 EDT 1990 |
X `--------------------------------------------------------'
X
X This is ECU revision 3.00.00. ECU is a asynchronous
X
X--- 1,5 -----
X .--------------------------------------------------------.
X! | ECU README - last revised Thu Jan 10 04:05:48 EST 1991 |
X `--------------------------------------------------------'
X
X This is ECU revision 3.00.00. ECU is a asynchronous
X***************
X*** 16,21
X non-ANSI terminal must be fairly "smart", with insert/delete-line
X features, erase-to-end-of-line, etc.. See the manual.
X
X Many thanks to those who helped me improve the program,
X especially tbetz@upaya, jmd@wa4cyb, jts@ki4xo, jsm@n4vu,
X cma@tridom, neal@clkwrka, mjb@mjbtn and rob@genrad.
X
X--- 16,28 -----
X non-ANSI terminal must be fairly "smart", with insert/delete-line
X features, erase-to-end-of-line, etc.. See the manual.
X
X+ Experimental work has been done for a port to ISC. The program
X+ compiles properly, but very little testing has been done. The
X+ shared dial-in/dial-out tty facility is very different between
X+ SCO and ISC and tty naming is different. I would appreciate any
X+ help and comments. John "Pappy" Dashner (jmd@p1so) is
X+ responsible for the bulk of the effort to date.
X+
X Many thanks to those who helped me improve the program,
X especially tbetz@upaya, jmd@wa4cyb, jts@ki4xo, jsm@n4vu,
X cma@tridom, neal@clkwrka, mjb@mjbtn and rob@genrad.
X***************
X*** 116,121
X 2. copy Make.ecu to Makefile
X
X 3. edit ./Makefile to match your local system and requirements
X
X 4. If your username is root or you have write access to your
X local bin directory (LBIN in Makefile) just type 'make tools'
X
X--- 123,130 -----
X 2. copy Make.ecu to Makefile
X
X 3. edit ./Makefile to match your local system and requirements
X+ If you are not using SCO/MSC cc, pay particular attention to the
X+ predefined #define requirements described in the Makefile.
X
X 4. If your username is root or you have write access to your
X local bin directory (LBIN in Makefile) just type 'make tools'
X*** /u4/src/ecu3.01/afterlint.c Mon Dec 24 22:26:00 1990
X--- afterlint.c Wed Jan 9 22:31:34 1991
X***************
X*** 5,11
X Use with zgcc:
X
X #!/bin/csh
X! #zgcc -- build prototyping "LINT_ARGS"
X echo C sources in $1';' result file $2
X rm -f zg.t
X foreach i(`cat $1`)
X
X--- 5,11 -----
X Use with zgcc:
X
X #!/bin/csh
X! #zgcc -- build prototyping "__STDC__"
X echo C sources in $1';' result file $2
X rm -f zg.t
X foreach i(`cat $1`)
X***************
X*** 9,15
X echo C sources in $1';' result file $2
X rm -f zg.t
X foreach i(`cat $1`)
X! cc -DBUILDING_LINT_ARGS -Zg $argv[3-] $i > zg1.t
X sort zg1.t > zg2.t
X echo '/ *' $i '* /' >> zg.t #remove spaces inside comment markers
X cat zg2.t >> zg.t
X
X--- 9,15 -----
X echo C sources in $1';' result file $2
X rm -f zg.t
X foreach i(`cat $1`)
X! cc -DBUILDING_PROTOTYPES -Zg $argv[3-] $i > zg1.t
X sort zg1.t > zg2.t
X echo '/ *' $i '* /' >> zg.t #remove spaces inside comment markers
X cat zg2.t >> zg.t
X***************
X*** 20,25
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:11-18-1990-21:15-wht@n4hgf-clobber 'extern ' in prototypes */
X /*:07-13-1988-19:50-wht-creation */
X
X
X--- 20,26 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:11-18-1990-21:15-wht@n4hgf-clobber 'extern ' in prototypes */
X /*:07-13-1988-19:50-wht-creation */
X
X***************
X*** 131,138
X
X emit_editnote(fpout);
X ff(fpout,"\n");
X! ff(fpout,"#ifndef BUILDING_LINT_ARGS\n");
X! ff(fpout,"#ifdef LINT_ARGS\n\n");
X
X while(fgets(buf,sizeof(buf),fpin))
X {
X
X--- 132,139 -----
X
X emit_editnote(fpout);
X ff(fpout,"\n");
X! ff(fpout,"#ifndef BUILDING_PROTOTYPES\n");
X! ff(fpout,"#ifdef __STDC__\n\n");
X
X while(fgets(buf,sizeof(buf),fpin))
X {
X***************
X*** 165,172
X }
X }
X
X! ff(fpout,"\n#endif /* LINT_ARGS */\n");
X! ff(fpout,"#endif /* BUILDING_LINT_ARGS */\n");
X ff(fpout,"\n/* end of %s */\n",
X (argc > 2) ? basename : "function declarations");
X
X
X--- 166,173 -----
X }
X }
X
X! ff(fpout,"\n#endif /* __STDC__ */\n");
X! ff(fpout,"#endif /* BUILDING_PROTOTYPES */\n");
X ff(fpout,"\n/* end of %s */\n",
X (argc > 2) ? basename : "function declarations");
X
X*** /u4/src/ecu3.01/bamboozle.c Mon Dec 24 22:26:00 1990
X--- bamboozle.c Wed Jan 9 22:31:34 1991
X***************
X*** 3,8
X wht@n4hgf.Mt-Park.GA.US
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X char *crypt(char *,char *);
X
X--- 3,10 -----
X wht@n4hgf.Mt-Park.GA.US
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X+ /*:01-09-1991-21:05-wht@n4hgf-no prototype for crypt if not __STDC__ */
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X #ifdef __STDC__
X***************
X*** 5,10
X /*+:EDITS:*/
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X char *crypt(char *,char *);
X
X
X
X--- 7,13 -----
X /*:01-09-1991-21:05-wht@n4hgf-no prototype for crypt if not __STDC__ */
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X+ #ifdef __STDC__
X char *crypt(char *,char *);
X #else
X char *crypt();
X***************
X*** 6,11
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X char *crypt(char *,char *);
X
X
X /*+-------------------------------------------------------------------------
X
X--- 9,17 -----
X
X #ifdef __STDC__
X char *crypt(char *,char *);
X+ #else
X+ char *crypt();
X+ #endif
X
X
X /*+-------------------------------------------------------------------------
X*** /u4/src/ecu3.01/ecu.c Tue Jan 1 23:05:08 1991
X--- ecu.c Wed Jan 9 22:31:33 1991
X***************
X*** 8,13
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:11-30-1990-19:04-wht@n4hgf-new ttyinit parameter - see TTYINIT_... */
X /*:11-28-1990-15:58-wht@n4hgf-add non-ansi terminal support */
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X
X--- 8,14 -----
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:11-30-1990-19:04-wht@n4hgf-new ttyinit parameter - see TTYINIT_... */
X /*:11-28-1990-15:58-wht@n4hgf-add non-ansi terminal support */
X /*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
X***************
X*** 111,117
X write(TTYERR,&nlchar,1);
X }
X } /* end of while we can read a character */
X- return(HANGUP_XMTR_LOGIC_ERROR); /* should not have gotten here */
X
X } /* end of xmtr */
X
X
X--- 112,117 -----
X write(TTYERR,&nlchar,1);
X }
X } /* end of while we can read a character */
X
X } /* end of xmtr */
X
X*** /u4/src/ecu3.01/ecu.h Tue Jan 1 23:05:08 1991
X--- ecu.h Wed Jan 9 21:41:33 1991
X***************
X*** 8,17
X
X #define ECULIBDIR "/usr/local/lib/ecu"
X
X- #if defined(__GCC__) && !defined(__STDC__)
X- #define __STDC__
X- #endif
X-
X #if defined(__STDC__) /* sigh ... malloc and such types */
X #define VTYPE void
X #else
X
X--- 8,13 -----
X
X #define ECULIBDIR "/usr/local/lib/ecu"
X
X #if defined(__STDC__) /* sigh ... malloc and such types */
X #define VTYPE void
X #else
X***************
X*** 26,32
X #include <sys/types.h>
X #include <errno.h>
X #include <sys/timeb.h>
X!
X #include <memory.h>
X #include <sys/stat.h>
X #include <string.h>
X
X--- 22,29 -----
X #include <sys/types.h>
X #include <errno.h>
X #include <sys/timeb.h>
X! #include <string.h>
X! #if defined(M_SYSV)
X #include <memory.h>
X #endif
X #include <sys/stat.h>
X***************
X*** 28,33
X #include <sys/timeb.h>
X
X #include <memory.h>
X #include <sys/stat.h>
X #include <string.h>
X #include <fcntl.h>
X
X--- 25,31 -----
X #include <string.h>
X #if defined(M_SYSV)
X #include <memory.h>
X+ #endif
X #include <sys/stat.h>
X #include <fcntl.h>
X #if !defined(OMIT_TERMIO_REFERENCES)
X***************
X*** 29,35
X
X #include <memory.h>
X #include <sys/stat.h>
X- #include <string.h>
X #include <fcntl.h>
X #if !defined(OMIT_TERMIO_REFERENCES)
X #include <termio.h>
X
X--- 27,32 -----
X #include <memory.h>
X #endif
X #include <sys/stat.h>
X #include <fcntl.h>
X #if !defined(OMIT_TERMIO_REFERENCES)
X #include <termio.h>
X***************
X*** 47,53
X #endif
X
X #ifndef ECULIBDIR
X! #define ECULIBDIR "/usr/lib/ecu"
X #endif
X
X #include "ecuhangup.h"
X
X--- 44,50 -----
X #endif
X
X #ifndef ECULIBDIR
X! #define ECULIBDIR "/usr/local/lib/ecu"
X #endif
X
X #include "ecuhangup.h"
X***************
X*** 86,92
X #define TTYERR 2 /* ditty tty output error channel */
X
X /* xbell codes */
X- #if defined(M_XENIX) || defined(M_UNIX)
X #define XBELL_DONE 1 /* octaves or morse 'd' */
X #define XBELL_ATTENTION 2 /* morse .-.-.- ATTENTION */
X #define XBELL_C 3 /* morse -.-. C */
X
X--- 83,88 -----
X #define TTYERR 2 /* ditty tty output error channel */
X
X /* xbell codes */
X #define XBELL_DONE 1 /* octaves or morse 'd' */
X #define XBELL_ATTENTION 2 /* morse .-.-.- ATTENTION */
X #define XBELL_C 3 /* morse -.-. C */
X***************
X*** 91,97
X #define XBELL_ATTENTION 2 /* morse .-.-.- ATTENTION */
X #define XBELL_C 3 /* morse -.-. C */
X #define XBELL_3T 4 /* --- really 'o' */
X- #endif
X
X /* lopen() and related routines error codes */
X #define LOPEN_INVALID -1 /* for invalid tty name */
X
X--- 87,92 -----
X #define XBELL_ATTENTION 2 /* morse .-.-.- ATTENTION */
X #define XBELL_C 3 /* morse -.-. C */
X #define XBELL_3T 4 /* --- really 'o' */
X
X /* lopen() and related routines error codes */
X #define LOPEN_INVALID -1 /* for invalid tty name */
X*** /u4/src/ecu3.01/ecuDCE.c Tue Jan 1 23:05:10 1991
X--- ecuDCE.c Wed Jan 9 22:31:33 1991
X***************
X*** 23,28
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X
X--- 23,30 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X+ /*:01-09-1991-21:23-wht@n4hgf-fix statement not reached */
X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X***************
X*** 132,138
X {
X erc = eSyntaxError;
X goto SHOW_ERROR;
X- return;
X }
X if(ulindex(typestr,"init_") == 0)
X type = MI_INIT;
X
X--- 134,139 -----
X {
X erc = eSyntaxError;
X goto SHOW_ERROR;
X }
X if(ulindex(typestr,"init_") == 0)
X type = MI_INIT;
X***************
X*** 311,317
X lr.delim = (char *)0;
X lr.echo = 0;
X lgets_timeout(&lr);
X- return(lr.buffer);
X
X /* reset any interrupt indication since we look at string */
X interrupt = 0;
X
X--- 312,317 -----
X lr.delim = (char *)0;
X lr.echo = 0;
X lgets_timeout(&lr);
X
X /* reset any interrupt indication since we look at string */
X interrupt = 0;
X***************
X*** 316,321
X /* reset any interrupt indication since we look at string */
X interrupt = 0;
X
X } /* end of DCE_get_result */
X
X /*+-------------------------------------------------------------------------
X
X--- 316,322 -----
X /* reset any interrupt indication since we look at string */
X interrupt = 0;
X
X+ return(lr.buffer);
X } /* end of DCE_get_result */
X
X /*+-------------------------------------------------------------------------
X***************
X*** 534,540
X result = s128;
X iv[0] = 0;
X erc = 0;
X! goto START_RCVR_PROCESS;
X }
X else
X {
X
X--- 535,541 -----
X result = s128;
X iv[0] = 0;
X erc = 0;
X! shm->Lmodem_off_hook = 1;
X }
X else
X {
X***************
X*** 665,672
X erc = eConnectFailed;
X goto START_RCVR_PROCESS;
X }
X-
X- shm->Lmodem_off_hook = 1;
X
X START_RCVR_PROCESS: ;
X setcolor(colors_at_entry);
X
X--- 666,671 -----
X erc = eConnectFailed;
X goto START_RCVR_PROCESS;
X }
X
X START_RCVR_PROCESS: ;
X setcolor(colors_at_entry);
X*** /u4/src/ecu3.01/ecucmd.h Mon Dec 24 22:30:00 1990
X--- ecucmd.h Tue Jan 8 03:09:27 1991
X***************
X*** 41,46
X #define CTrev 33
X #define CTrk 34
X #define CTrs 35
X #define CTrtscts 36
X #define CTrx 37
X #define CTry 38
X
X--- 41,47 -----
X #define CTrev 33
X #define CTrk 34
X #define CTrs 35
X+ #if defined(RTSFLOW)
X #define CTrtscts 36
X #endif
X #define CTrx 37
X***************
X*** 42,47
X #define CTrk 34
X #define CTrs 35
X #define CTrtscts 36
X #define CTrx 37
X #define CTry 38
X #define CTrz 39
X
X--- 43,49 -----
X #define CTrs 35
X #if defined(RTSFLOW)
X #define CTrtscts 36
X+ #endif
X #define CTrx 37
X #define CTry 38
X #define CTrz 39
X***************
X*** 275,280
X { "rk", 2,CTrk, "receive via C-Kermit", pcmd_rk, ccT},
X { "rname", 0,0, "", pcmd_rname, 0 },
X { "rs", 2,CTrs, "receive via SEAlink", pcmd_rs, ccT},
X { "rtscts", 3,CTrtscts, "control RTS/CTS flow control", 0, ccC},
X { "rx", 2,CTrx, "receive via XMODEM/CRC", pcmd_rx, ccT},
X { "ry", 2,CTry, "receive via YMODEM Batch", pcmd_ry, ccT},
X
X--- 277,283 -----
X { "rk", 2,CTrk, "receive via C-Kermit", pcmd_rk, ccT},
X { "rname", 0,0, "", pcmd_rname, 0 },
X { "rs", 2,CTrs, "receive via SEAlink", pcmd_rs, ccT},
X+ #if defined(RTSFLOW)
X { "rtscts", 3,CTrtscts, "control RTS/CTS flow control", 0, ccC},
X #endif
X { "rx", 2,CTrx, "receive via XMODEM/CRC", pcmd_rx, ccT},
X***************
X*** 276,281
X { "rname", 0,0, "", pcmd_rname, 0 },
X { "rs", 2,CTrs, "receive via SEAlink", pcmd_rs, ccT},
X { "rtscts", 3,CTrtscts, "control RTS/CTS flow control", 0, ccC},
X { "rx", 2,CTrx, "receive via XMODEM/CRC", pcmd_rx, ccT},
X { "ry", 2,CTry, "receive via YMODEM Batch", pcmd_ry, ccT},
X { "rz", 2,CTrz, "receive via ZMODEM/CRC32", pcmd_rz, ccT},
X
X--- 279,285 -----
X { "rs", 2,CTrs, "receive via SEAlink", pcmd_rs, ccT},
X #if defined(RTSFLOW)
X { "rtscts", 3,CTrtscts, "control RTS/CTS flow control", 0, ccC},
X+ #endif
X { "rx", 2,CTrx, "receive via XMODEM/CRC", pcmd_rx, ccT},
X { "ry", 2,CTry, "receive via YMODEM Batch", pcmd_ry, ccT},
X { "rz", 2,CTrz, "receive via ZMODEM/CRC32", pcmd_rz, ccT},
X*** /u4/src/ecu3.01/ecufriend/Makefile Mon Aug 13 18:48:00 1990
X--- ecufriend/Makefile Tue Jan 8 04:34:27 1991
X***************
X*** 10,13
X #:11-19-1989-18:06-wht-creation
X
X ecufriend: ecufriend.c
X! cc -O `sysdep =M_I286 -M2e =M_I386` ecufriend.c -o $@
X
X--- 10,13 -----
X #:11-19-1989-18:06-wht-creation
X
X ecufriend: ecufriend.c
X! cc -O `sysdep =M_I286 -M2e =M_I386 =ISC` ecufriend.c -o $@
X*** /u4/src/ecu3.01/ecuicmd.c Mon Dec 24 22:47:00 1990
X--- ecuicmd.c Wed Jan 9 22:31:31 1991
X***************
X*** 9,14
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:12-24-1990-04:31-wht@n4hgf-experimental esio driver command */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X
X--- 9,15 -----
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:12-24-1990-04:31-wht@n4hgf-experimental esio driver command */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X***************
X*** 474,479
X (want_bell_notify == 2) ? ": ring on incoming char" : "");
X break;
X
X case CTrtscts:
X if(narg > 1)
X {
X
X--- 475,481 -----
X (want_bell_notify == 2) ? ": ring on incoming char" : "");
X break;
X
X+ #if defined(RTSFLOW) /* only SCO has this */
X case CTrtscts:
X if(narg > 1)
X {
X***************
X*** 483,488
X (Ltermio.c_cflag & RTSFLOW) ? "on" : "off",
X (Ltermio.c_cflag & CTSFLOW) ? "on" : "off");
X break;
X
X case CTfkey:
X if(narg < 2)
X
X--- 485,491 -----
X (Ltermio.c_cflag & RTSFLOW) ? "on" : "off",
X (Ltermio.c_cflag & CTSFLOW) ? "on" : "off");
X break;
X+ #endif
X
X case CTfkey:
X if(narg < 2)
X*** /u4/src/ecu3.01/eculine.c Tue Jan 1 23:05:15 1991
X--- eculine.c Wed Jan 9 22:31:32 1991
X***************
X*** 35,40
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include "ecu.h"
X
X--- 35,42 -----
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X+ /*:01-09-1991-21:26-wht@n4hgf-don't prototype nap() (ISC port) */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include "ecu.h"
X***************
X*** 41,47
X #include "ecukey.h"
X #include "ecuhangup.h"
X #if !defined(NO_SELECT)
X! # include <sys/select.h>
X #endif
X
X extern int rcvr_pid;
X
X--- 43,52 -----
X #include "ecukey.h"
X #include "ecuhangup.h"
X #if !defined(NO_SELECT)
X! #if defined(M_SYSV) /* SCO */
X! #include <sys/select.h>
X! #else
X! #include <sys/time.h>
X #endif
X #endif
X
X***************
X*** 43,48
X #if !defined(NO_SELECT)
X # include <sys/select.h>
X #endif
X
X extern int rcvr_pid;
X extern int errno;
X
X--- 48,54 -----
X #else
X #include <sys/time.h>
X #endif
X+ #endif
X
X extern int rcvr_pid;
X extern int errno;
X***************
X*** 182,188
X int delim_len;
X long quantum;
X long ltmp;
X! long nap(long);
X
X delim_len = (lrwt->delim) ? strlen(lrwt->delim) : 0;
X
X
X--- 188,194 -----
X int delim_len;
X long quantum;
X long ltmp;
X! long nap();
X
X delim_len = (lrwt->delim) ? strlen(lrwt->delim) : 0;
X
X***************
X*** 665,670
X /*+-------------------------------------------------------------------------
X lRTSCTS_control(flag)
X --------------------------------------------------------------------------*/
X void
X lRTSCTS_control(flag)
X int flag;
X
X--- 671,677 -----
X /*+-------------------------------------------------------------------------
X lRTSCTS_control(flag)
X --------------------------------------------------------------------------*/
X+ #if defined(RTSFLOW) /* only SCO */
X void
X lRTSCTS_control(flag)
X int flag;
X***************
X*** 697,702
X ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);
X
X } /* end of lRTSCTS_control */
X
X /*+-------------------------------------------------------------------------
X lnew_baud_rate(new_baud)
X
X--- 704,710 -----
X ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);
X
X } /* end of lRTSCTS_control */
X+ #endif /* RTSFLOW */
X
X /*+-------------------------------------------------------------------------
X lnew_baud_rate(new_baud)
SHAR_EOF
chmod 0644 PATCH02.01 ||
echo 'restore of PATCH02.01 failed'
Wc_c="`wc -c < 'PATCH02.01'`"
test 31013 -eq "$Wc_c" ||
echo 'PATCH02.01: original size 31013, current size' "$Wc_c"
true || echo 'restore of PATCH02.02 failed'
echo End of part 1, continue with part 2
exit 0
exit 0 # Just in case...
--
Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM
Sterling Software, IMD UUCP: uunet!sparky!kent
Phone: (402) 291-8300 FAX: (402) 291-4362
Please send comp.sources.misc-related mail to kent@uunet.uu.net.