wht@n4hgf.Mt-Park.GA.US (01/12/91)
Submitted-by: wht@n4hgf.Mt-Park.GA.US
Posting-number: Volume 16, Issue 71
Archive-name: ecu3/patch2b
Patch-To: ecu3: Volume 16, Issue 25-59
#!/bin/sh
# This is part 02 of ecu3/patch2
# ============= PATCH02.02 ==============
echo 'x - extracting PATCH02.02 (Text)'
sed 's/^X//' << 'SHAR_EOF' > 'PATCH02.02' &&
X:
X#+-------------------------------------------------------------------------
X# ECU 3.0 PATCH # 2 Part 2/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/ecuphone.c Tue Jan 1 23:05:20 1991
X--- ecuphone.c Wed Jan 9 22:31:30 1991
X***************
X*** 58,63
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include <curses.h>
X
X--- 58,64 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include <curses.h>
X***************
X*** 1646,1651
X case 0: /* CONNECTED */
X tpde->redial = 0;
X pde_marked_for_redial_count--;
X bell_notify(XBELL_C);
X return(1);
X case 2: /* INTERRUPTED */
X
X--- 1647,1653 -----
X case 0: /* CONNECTED */
X tpde->redial = 0;
X pde_marked_for_redial_count--;
X+ #if defined(M_SYSV)
X bell_notify(XBELL_C);
X #endif
X return(1);
X***************
X*** 1647,1652
X tpde->redial = 0;
X pde_marked_for_redial_count--;
X bell_notify(XBELL_C);
X return(1);
X case 2: /* INTERRUPTED */
X ff(se,"\r\ndial interrupted: abort cycle (y,n)? ");
X
X--- 1649,1655 -----
X pde_marked_for_redial_count--;
X #if defined(M_SYSV)
X bell_notify(XBELL_C);
X+ #endif
X return(1);
X case 2: /* INTERRUPTED */
X ff(se,"\r\ndial interrupted: abort cycle (y,n)? ");
X***************
X*** 1704,1711
X if(!tpde)
X tpde = pde_list_head;
X }
X- /*NOTREACHED*/
X- return(0); /* but just in case */
X
X ABORT_CYCLE:
X interrupt = 0;
X
X--- 1707,1712 -----
X if(!tpde)
X tpde = pde_list_head;
X }
X
X ABORT_CYCLE:
X interrupt = 0;
X*** /u4/src/ecu3.01/ecurcvr.c Tue Jan 1 23:05:22 1991
X--- ecurcvr.c Wed Jan 9 22:31:29 1991
X***************
X*** 49,54
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:12-26-1990-14:32-wht@n4hgf-use memset in spaces() */
X /*:12-21-1990-21:06-wht@n4hgf-CUF and CUB set non-ansi cursor incorrectly */
X /*:12-20-1990-16:27-wht@n4hgf-had SU and SD swapped */
X
X--- 49,55 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:12-26-1990-14:32-wht@n4hgf-use memset in spaces() */
X /*:12-21-1990-21:06-wht@n4hgf-CUF and CUB set non-ansi cursor incorrectly */
X /*:12-20-1990-16:27-wht@n4hgf-had SU and SD swapped */
X***************
X*** 1102,1107
X {
X shmr_set_xmtr_bn_1();
X want_bell_notify = 1;
X bell_notify(XBELL_3T);
X }
X else if(rchar == 7)
X
X--- 1103,1109 -----
X {
X shmr_set_xmtr_bn_1();
X want_bell_notify = 1;
X+ #if defined(M_SYSV)
X bell_notify(XBELL_3T);
X #endif
X }
X***************
X*** 1103,1108
X shmr_set_xmtr_bn_1();
X want_bell_notify = 1;
X bell_notify(XBELL_3T);
X }
X else if(rchar == 7)
X {
X
X--- 1105,1111 -----
X want_bell_notify = 1;
X #if defined(M_SYSV)
X bell_notify(XBELL_3T);
X+ #endif
X }
X else if(rchar == 7)
X {
X***************
X*** 1106,1111
X }
X else if(rchar == 7)
X {
X bell_notify(XBELL_ATTENTION);
X return(0);
X }
X
X--- 1109,1115 -----
X }
X else if(rchar == 7)
X {
X+ #if defined(M_SYSV)
X bell_notify(XBELL_ATTENTION);
X #endif
X return(0);
X***************
X*** 1107,1112
X else if(rchar == 7)
X {
X bell_notify(XBELL_ATTENTION);
X return(0);
X }
X
X
X--- 1111,1117 -----
X {
X #if defined(M_SYSV)
X bell_notify(XBELL_ATTENTION);
X+ #endif
X return(0);
X }
X
X*** /u4/src/ecu3.01/ecushm.h Mon Dec 24 22:33:00 1990
X--- ecushm.h Wed Jan 9 22:24:49 1991
X***************
X*** 9,15
X /*:11-28-1990-17:43-wht@n4hgf-move cursor_y, cursor_x to right after revision */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X! #if defined(M_I386)
X #define FAR
X #else
X #define FAR far
X
X--- 9,15 -----
X /*:11-28-1990-17:43-wht@n4hgf-move cursor_y, cursor_x to right after revision */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X! #if defined(i386) || defined(M_I386)
X #define FAR
X #else
X #define FAR far
X*** /u4/src/ecu3.01/ecusighdl.c Tue Jan 1 23:05:26 1991
X--- ecusighdl.c Wed Jan 2 13:50:10 1991
X***************
X*** 183,190
X {
X case HANGUP_LINE_READ_ERROR: return("line read error");
X case HANGUP_XMTR_WRITE_ERROR: return("line write error");
X! case HANGUP_XMTR_LOGIC_ERROR: return("XMTR LOGIC ERROR");
X! case HANGUP_RCVR_LOGIC_ERROR: return("RCVR LOGIC ERROR");
X case HANGUP_BSD4_IOCTL: return("BSD4 ioctl error");
X case HANGUP_SHM_ABL: return("SHM ABL error");
X case HANGUP_SHM_RTL: return("SHM RTL error");
X
X--- 183,190 -----
X {
X case HANGUP_LINE_READ_ERROR: return("line read error");
X case HANGUP_XMTR_WRITE_ERROR: return("line write error");
X! case HANGUP_XMTR_LOGIC_ERROR: return("detected XMTR LOGIC ERROR");
X! case HANGUP_RCVR_LOGIC_ERROR: return("detected RCVR LOGIC ERROR");
X case HANGUP_BSD4_IOCTL: return("BSD4 ioctl error");
X case HANGUP_SHM_ABL: return("SHM ABL error");
X case HANGUP_SHM_RTL: return("SHM RTL error");
X*** /u4/src/ecu3.01/ecutty.c Tue Jan 1 23:05:28 1991
X--- ecutty.c Tue Jan 8 03:09:30 1991
X***************
X*** 31,36
X #include "ecuxkey.h"
X #include "ecuerror.h"
X #include "ecuhangup.h"
X #include <sys/machdep.h>
X
X #define DEFINE_TTY_DATA
X
X--- 31,37 -----
X #include "ecuxkey.h"
X #include "ecuerror.h"
X #include "ecuhangup.h"
X+ #if defined(M_SYSV)
X #include <sys/machdep.h>
X #else
X # include <sys/at_ansi.h>
X***************
X*** 32,37
X #include "ecuerror.h"
X #include "ecuhangup.h"
X #include <sys/machdep.h>
X
X #define DEFINE_TTY_DATA
X #include "ecutty.h"
X
X--- 33,42 -----
X #include "ecuhangup.h"
X #if defined(M_SYSV)
X #include <sys/machdep.h>
X+ #else
X+ # include <sys/at_ansi.h>
X+ # include <sys/kd.h>
X+ #endif
X
X #define DEFINE_TTY_DATA
X #include "ecutty.h"
X*** /u4/src/ecu3.01/ecuungetty/Makefile Sat Oct 20 14:30:00 1990
X--- ecuungetty/Makefile Tue Jan 8 04:36:26 1991
X***************
X*** 13,19
X #:11-23-1989-02:37-wht-start support for UNIX V/386
X #:11-02-1989-16:00-wht-unet2 release
X
X! CFLAGS = `sysdep =M_I386 -O =M_I286 -O -M2le`
X
X OBJ = \
X ../ecuuclc.o\
X
X--- 13,19 -----
X #:11-23-1989-02:37-wht-start support for UNIX V/386
X #:11-02-1989-16:00-wht-unet2 release
X
X! CFLAGS = `sysdep =M_I386 -O =M_I286 -O -M2le =ISC`
X
X OBJ = \
X ../ecuuclc.o\
X***************
X*** 23,30
X ecuungetty.o
X
X #overriden by master make file
X! ECULIBDIR = /usr/lib/ecu
X! #ECULIBDIR = /usr/local/lib/ecu
X
X all: ecuungetty
X
X
X--- 23,29 -----
X ecuungetty.o
X
X #overriden by master make file
X! ECULIBDIR = /usr/local/lib/ecu
X
X all: ecuungetty
X
X*** /u4/src/ecu3.01/ecuutil.c Tue Jan 1 23:05:30 1991
X--- ecuutil.c Tue Jan 8 03:09:33 1991
X***************
X*** 543,549
X (flag & CREAD ) ? 1 : 0,
X (flag & HUPCL ) ? 1 : 0,
X (flag & CLOCAL) ? 1 : 0);
X! #ifdef RTSFLOW
X pprintf(" RTSFLOW:%d CTSFLOW:%d",
X (flag & RTSFLOW ) ? 1 : 0,
X (flag & CTSFLOW ) ? 1 : 0);
X
X--- 543,549 -----
X (flag & CREAD ) ? 1 : 0,
X (flag & HUPCL ) ? 1 : 0,
X (flag & CLOCAL) ? 1 : 0);
X! #if defined(RTSFLOW) /* only SCO */
X pprintf(" RTSFLOW:%d CTSFLOW:%d",
X (flag & RTSFLOW ) ? 1 : 0,
X (flag & CTSFLOW ) ? 1 : 0);
X***************
X*** 735,741
X {
X static char home_directory[256] = "";
X struct passwd *pwent;
X- struct passwd *getpwuid();
X
X if(home_directory[0])
X {
X
X--- 735,740 -----
X {
X static char home_directory[256] = "";
X struct passwd *pwent;
X
X if(home_directory[0])
X {
X***************
X*** 760,766
X Directory-creating routines from Public Domain TAR by John Gilmore
X Make a directory. Compatible with the mkdir() system call on 4.2BSD.
X --------------------------------------------------------------------------*/
X! #if !defined(M_UNIX) || defined(__GNUC__)
X #define TERM_SIGNAL(status) ((status) & 0x7F)
X #define TERM_COREDUMP(status) (((status) & 0x80) != 0)
X #define TERM_VALUE(status) ((status) >> 8)
X
X--- 759,765 -----
X Directory-creating routines from Public Domain TAR by John Gilmore
X Make a directory. Compatible with the mkdir() system call on 4.2BSD.
X --------------------------------------------------------------------------*/
X! #if !defined(M_UNIX)
X #define TERM_SIGNAL(status) ((status) & 0x7F)
X #define TERM_COREDUMP(status) (((status) & 0x80) != 0)
X #define TERM_VALUE(status) ((status) >> 8)
X*** /u4/src/ecu3.01/ecuxenix.c Tue Jan 1 23:05:31 1991
X--- ecuxenix.c Wed Jan 9 22:31:28 1991
X***************
X*** 20,25
X This module is a grab bag for historical reasons. Needs reorg.
X ------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:12-04-1990-03:55-wht@n4hgf-bell_notify only if on multiscreen */
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--- 20,26 -----
X This module is a grab bag for historical reasons. Needs reorg.
X ------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:12-04-1990-03:55-wht@n4hgf-bell_notify only if on multiscreen */
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*** 415,421
X char devname[64];
X int devnum;
X int ttnum;
X! long time(long *);
X
X if(!tty_is_multiscreen)
X {
X
X--- 416,422 -----
X char devname[64];
X int devnum;
X int ttnum;
X! long time();
X
X if(!tty_is_multiscreen)
X {
X***************
X*** 539,545
X /*+-------------------------------------------------------------------------
X rename(from,to)
X --------------------------------------------------------------------------*/
X! #if !defined(M_UNIX) || defined(__GNUC__)
X rename(from,to)
X char *from;
X char *to;
X
X--- 540,546 -----
X /*+-------------------------------------------------------------------------
X rename(from,to)
X --------------------------------------------------------------------------*/
X! #if !defined(M_UNIX)
X rename(from,to)
X char *from;
X char *to;
X*** /u4/src/ecu3.01/gendial/dceMC9624.c Thu Nov 29 18:31:00 1990
X--- gendial/dceMC9624.c Sat Jan 5 13:48:04 1991
X***************
X*** 6,11
X wht@n4hgf.Mt-Park.GA.US
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:11-29-1990-18:31-r@n4hgf-revision/1st releasable */
X /*:07-24-1990-15:36-wht@n4hgf-add speaker on/off */
X /*:07-20-1990-00:10-wht@n4hgf-creation */
X
X--- 6,12 -----
X wht@n4hgf.Mt-Park.GA.US
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-05-1991-13:48-root@n4hgf-ATZ during reset - modem is flakey */
X /*:11-29-1990-18:31-r@n4hgf-revision/1st releasable */
X /*:07-24-1990-15:36-wht@n4hgf-add speaker on/off */
X /*:07-20-1990-00:10-wht@n4hgf-creation */
X***************
X*** 189,194
X void
X DCE_hangup()
X {
X char *dialin = "ATS0=1Q1E0M0\\N3\\Q1\\G1%C1%P2\r";
X
X DEBUG(7,"INITIALIZING %s\n",dce_name);
X
X--- 190,196 -----
X void
X DCE_hangup()
X {
X+ char *reset_it = "ATZ\r";
X char *dialin = "ATS0=1Q1E0M0\\N3\\Q1\\G1%C1%P2\r";
X
X DEBUG(7,"INITIALIZING %s\n",dce_name);
X***************
X*** 195,200
X
X ltoggleDTR(2000L);
X sync_Microcom();
X lwrite(dialin);
X nap(500L);
X
X
X--- 197,204 -----
X
X ltoggleDTR(2000L);
X sync_Microcom();
X+ lwrite(reset_it);
X+ lread_ignore(5);
X lwrite(dialin);
X nap(500L);
X
X*** /u4/src/ecu3.01/gendial/dceT1000.c Wed Dec 26 05:02:00 1990
X--- gendial/dceT1000.c Wed Jan 2 02:37:04 1991
X***************
X*** 298,304
X DCE_hangup()
X {
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggle_DTR(0L);
X nap(100L);
X init_TBPlus();
X
X
X--- 298,304 -----
X DCE_hangup()
X {
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggleDTR(0L);
X nap(100L);
X init_TBPlus();
X
X*** /u4/src/ecu3.01/gendial/dceT2500.c Mon Dec 24 17:55:00 1990
X--- gendial/dceT2500.c Wed Jan 2 02:37:05 1991
X***************
X*** 303,309
X {
X #ifdef TRUSTING
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggle_DTR(0L);
X lwrite("ATZ\r");
X (void)lread_ignore(1);
X #else /* !TRUSTING */
X
X--- 303,309 -----
X {
X #ifdef TRUSTING
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggleDTR(0L);
X lwrite("ATZ\r");
X (void)lread_ignore(1);
X #else /* !TRUSTING */
X*** /u4/src/ecu3.01/gendial/dceTBPlus.c Wed Dec 26 04:55:00 1990
X--- gendial/dceTBPlus.c Wed Jan 2 02:37:05 1991
X***************
X*** 298,304
X {
X #ifdef TRUSTING
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggle_DTR(0L);
X lwrite("ATZ\r");
X (void)lread_ignore(1);
X #else /* !TRUSTING */
X
X--- 298,304 -----
X {
X #ifdef TRUSTING
X DEBUG(7,"RESETING %s\n",dce_name);
X! ltoggleDTR(0L);
X lwrite("ATZ\r");
X (void)lread_ignore(1);
X #else /* !TRUSTING */
X*** /u4/src/ecu3.01/gendial/gendial.c Fri Aug 31 14:57:00 1990
X--- gendial/gendial.c Wed Jan 2 02:42:57 1991
X***************
X*** 631,637
X break;
X }
X ff(se,"%s exec error %d (%s)\n",ungetty,errno,sys_errlist[errno]);
X! __exit(-1);
X }
X
X while(((itmp = wait(&wait_status)) != pid) && itmp != -1)
X
X--- 631,637 -----
X break;
X }
X ff(se,"%s exec error %d (%s)\n",ungetty,errno,sys_errlist[errno]);
X! _exit(-1);
X }
X
X while(((itmp = wait(&wait_status)) != pid) && itmp != -1)
X*** /u4/src/ecu3.01/gint.c Mon Dec 24 22:38:00 1990
X--- gint.c Wed Jan 9 22:31:27 1991
X***************
X*** 11,16
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--- 11,17 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include "ecu.h"
X***************
X*** 253,259
X int_accum %= int1;
X break;
X case OP_XOR:
X! (unsigned)int_accum ^= (unsigned)int1;
X break;
X case OP_AND:
X (unsigned)int_accum &= (unsigned)int1;
X
X--- 254,260 -----
X int_accum %= int1;
X break;
X case OP_XOR:
X! int_accum ^= (unsigned)int1;
X break;
X case OP_AND:
X int_accum &= (unsigned)int1;
X***************
X*** 256,262
X (unsigned)int_accum ^= (unsigned)int1;
X break;
X case OP_AND:
X! (unsigned)int_accum &= (unsigned)int1;
X break;
X case OP_OR:
X (unsigned)int_accum |= (unsigned)int1;
X
X--- 257,263 -----
X int_accum ^= (unsigned)int1;
X break;
X case OP_AND:
X! int_accum &= (unsigned)int1;
X break;
X case OP_OR:
X int_accum |= (unsigned)int1;
X***************
X*** 259,265
X (unsigned)int_accum &= (unsigned)int1;
X break;
X case OP_OR:
X! (unsigned)int_accum |= (unsigned)int1;
X break;
X default:
X return(eInvalidIntOp);
X
X--- 260,266 -----
X int_accum &= (unsigned)int1;
X break;
X case OP_OR:
X! int_accum |= (unsigned)int1;
X break;
X default:
X return(eInvalidIntOp);
X*** /u4/src/ecu3.01/help/Makefile Mon Aug 13 18:48:00 1990
X--- help/Makefile Tue Jan 8 04:37:16 1991
X***************
X*** 12,19
X SHELL = /bin/sh
X .SUFFIXES: .o .c .h
X
X! COMFLAGS = -s
X! CFLAGS = -c `sysdep =M_UNIX -O -DLINT_ARGS =M_XENIX -Ox -DLINT_ARGS =pyr -O` $(COMFLAGS)
X LDFLAGS = # -m helpgen.map
X
X .c.o:; cc $(CFLAGS) $*.c
X
X--- 12,19 -----
X SHELL = /bin/sh
X .SUFFIXES: .o .c .h
X
X! COMFLAGS =
X! CFLAGS = -c `sysdep =M_UNIX -O -DLINT_ARGS =M_XENIX -Ox -DLINT_ARGS =ISC` $(COMFLAGS)
X LDFLAGS = # -m helpgen.map
X
X .c.o:; cc $(CFLAGS) $*.c
X*** /u4/src/ecu3.01/help/helpgen.c Tue Aug 14 20:42:00 1990
X--- help/helpgen.c Tue Jan 8 03:09:35 1991
X***************
X*** 20,26
X #include <stdio.h>
X #include <ctype.h>
X
X! #if defined(M_SYS5)
X #if !defined(LINT_ARGS)
X #define LINT_ARGS
X #endif
X
X--- 20,26 -----
X #include <stdio.h>
X #include <ctype.h>
X
X! #if defined(M_SYSV)
X #if !defined(LINT_ARGS)
X #define LINT_ARGS
X #endif
X***************
X*** 26,31
X #endif
X #endif
X # include "lint_args.h"
X
X #define DECLARE_P_CMD
X #define HELPGEN
X
X--- 26,33 -----
X #endif
X #endif
X # include "lint_args.h"
X+ #include <sys/types.h>
X+ #include <termio.h>
X
X #define DECLARE_P_CMD
X #define HELPGEN
X*** /u4/src/ecu3.01/lint_args.h Tue Jan 1 23:05:40 1991
X--- lint_args.h Wed Jan 9 21:13:22 1991
X***************
X*** 4,11
X /*+:EDITS:*/
X /*:12-04-1990-05:10-afterlint-creation */
X
X! #ifndef BUILDING_LINT_ARGS
X! #ifdef LINT_ARGS
X
X /* bamboozle.c */
X char *bamboozle(int );
X
X--- 4,11 -----
X /*+:EDITS:*/
X /*:12-04-1990-05:10-afterlint-creation */
X
X! #ifndef BUILDING_PROTOTYPES
X! #ifdef __STDC__
X
X /* bamboozle.c */
X char *bamboozle(int );
X***************
X*** 975,981
X void mkv_proc_terminating();
X void var_init();
X
X! #endif /* LINT_ARGS */
X! #endif /* BUILDING_LINT_ARGS */
X
X /* end of lint_args.h */
X
X--- 975,981 -----
X void mkv_proc_terminating();
X void var_init();
X
X! #endif /* __STDC__ */
X! #endif /* BUILDING_PROTOTYPES */
X
X /* end of lint_args.h */
X*** /u4/src/ecu3.01/nonansikey.c Mon Dec 24 22:40:00 1990
X--- nonansikey.c Wed Jan 2 16:11:26 1991
X***************
X*** 163,169
X char *name;
X {
X register itmp;
X- register char *cptr;
X char buf[128];
X FILE *fp_keys;
X int errstat = 0;
X
X--- 163,168 -----
X char *name;
X {
X register itmp;
X char buf[128];
X FILE *fp_keys;
X int errstat = 0;
X*** /u4/src/ecu3.01/pcmd.c Wed Dec 26 02:34:00 1990
X--- pcmd.c Wed Jan 9 22:31:26 1991
X***************
X*** 29,34
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:12-26-1990-02:34-wht@n4hgf-add cmd_rtscts */
X /*:12-03-1990-04:59-wht@n4hgf-beef up pcmd_exit */
X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */
X
X--- 29,35 -----
X
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:12-26-1990-02:34-wht@n4hgf-add cmd_rtscts */
X /*:12-03-1990-04:59-wht@n4hgf-beef up pcmd_exit */
X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */
X***************
X*** 1112,1117
X /*+-------------------------------------------------------------------------
X pcmd_rtscts(param)
X --------------------------------------------------------------------------*/
X int
X pcmd_rtscts(param)
X ESD *param;
X
X--- 1113,1119 -----
X /*+-------------------------------------------------------------------------
X pcmd_rtscts(param)
X --------------------------------------------------------------------------*/
X+ #if defined(RTSFLOW)
X int
X pcmd_rtscts(param)
X ESD *param;
X***************
X*** 1137,1142
X return(erc);
X
X } /* end of pcmd_rtscts */
X
X /* vi: set tabstop=4 shiftwidth=4: */
X /* end of pcmd.c */
X
X--- 1139,1145 -----
X return(erc);
X
X } /* end of pcmd_rtscts */
X+ #endif /* RTSFLOW */
X
X /* vi: set tabstop=4 shiftwidth=4: */
X /* end of pcmd.c */
X*** /u4/src/ecu3.01/pprintf.c Mon Dec 24 22:43:00 1990
X--- pprintf.c Wed Jan 9 22:31:26 1991
X***************
X*** 2,7
X pprintf.c - preocedure printf
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X /* based on Portable vsprintf by Robert A. Larson <blarson@skat.usc.edu> */
X
X--- 2,8 -----
X pprintf.c - preocedure printf
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X /* based on Portable vsprintf by Robert A. Larson <blarson@skat.usc.edu> */
X***************
X*** 19,25
X * The use of goto is NOT a bug.
X */
X
X! #if !defined(BUILDING_LINT_ARGS)
X
X #include <stdio.h>
X #include <varargs.h>
X
X--- 20,26 -----
X * The use of goto is NOT a bug.
X */
X
X! #if !defined(BUILDING_PROTOTYPES)
X
X #include <stdio.h>
X #include <varargs.h>
X***************
X*** 112,118
X dp += sprintf(dp,tempfmt,va_arg(args,double));
X break;
X case 'p':
X! #if defined(M_I386)
X dp += sprintf(dp,"0x%08lx",va_arg(args,pointer));
X #else
X #if defined(M_I286)
X
X--- 113,119 -----
X dp += sprintf(dp,tempfmt,va_arg(args,double));
X break;
X case 'p':
X! #if defined(i386) || defined(M_I386)
X dp += sprintf(dp,"0x%08lx",va_arg(args,pointer));
X #else
X #if defined(M_I286)
X***************
X*** 166,172
X va_end(args);
X pputs(accum_string);
X } /* end of pprintf */
X! #endif /* !defined(BUILDING_LINT_ARGS) */
X
X /* vi: set tabstop=4 shiftwidth=4: */
X /* end of pprintf.c */
X
X--- 167,173 -----
X va_end(args);
X pputs(accum_string);
X } /* end of pprintf */
X! #endif /* !defined(BUILDING_PROTOTYPES) */
X
X /* vi: set tabstop=4 shiftwidth=4: */
X /* end of pprintf.c */
X*** /u4/src/ecu3.01/sea/Makefile Fri Aug 17 11:49:00 1990
X--- sea/Makefile Tue Jan 8 04:37:40 1991
X***************
X*** 10,16
X #:10-11-1989-18:46-wht-needed more work to get makes to work away from my system
X #:07-03-1989-22:58-wht------ x2.00 -----
X
X! CFLAGS = -i -K -DLINT_ARGS `sysdep =M_I386 -DM_TERMCAP -Oactl =M_I286 -M2 -O`
X LFLAGS = -lx -ltcap -ltermlib
X
X SRC = \
X
X--- 10,16 -----
X #:10-11-1989-18:46-wht-needed more work to get makes to work away from my system
X #:07-03-1989-22:58-wht------ x2.00 -----
X
X! CFLAGS = -DLINT_ARGS `sysdep =M_I386 -DM_TERMCAP -Oactl =M_I286 -M2 -O =ISC`
X LFLAGS = -lx -ltcap -ltermlib
X
X SRC = \
X*** /u4/src/ecu3.01/stdio_lint.h Mon Dec 24 22:44:00 1990
X--- stdio_lint.h Wed Jan 9 21:13:22 1991
X***************
X*** 5,11
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X! #if defined(LINT_ARGS)
X char *gets(char *);
X char *getenv(char *);
X int access(char *,int);
X
X--- 5,11 -----
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X! #if defined(__STDC__)
X char *gets(char *);
X char *getenv(char *);
X int access(char *,int);
X*** /u4/src/ecu3.01/sysdep.c Mon Dec 24 22:44:00 1990
X--- sysdep.c Wed Jan 9 22:31:35 1991
X***************
X*** 2,7
X sysdep.c -- system dependency aid
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include <stdio.h>
X
X--- 2,9 -----
X sysdep.c -- system dependency aid
X --------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-09-1991-22:31-wht@n4hgf-ISC port */
X+ /*:01-09-1991-21:02-wht@n4hgf-add ISC and ISC22 */
X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X #include <stdio.h>
X***************
X*** 59,64
X #endif
X #if defined(M_INTERNAT)
X "M_INTERNAT",
X #endif
X (char *)0
X };
X
X--- 61,72 -----
X #endif
X #if defined(M_INTERNAT)
X "M_INTERNAT",
X+ #endif
X+ #if defined(ISC)
X+ "ISC",
X+ #endif
X+ #if defined(ISC22)
X+ "ISC22",
X #endif
X (char *)0
X };
X*** /u4/src/ecu3.01/utmpstat.c Mon Dec 24 22:44:00 1990
X--- utmpstat.c Fri Jan 4 18:20:59 1991
X***************
X*** 101,109
X idcopy[sizeof(idcopy) - 1] = 0;
X
X #if defined(M_UNIX)
X! if((!strncmp(namecopy,"uugetty",7) ||
X! !strncmp(namecopy,"getty",5)) &&
X! (ulindex(idcopy,line + 8) == (strlen(idcopy) - 2)))
X {
X if(itmp = line_locked(line))
X status = US_DIALOUT;
X
X--- 101,110 -----
X idcopy[sizeof(idcopy) - 1] = 0;
X
X #if defined(M_UNIX)
X! if(!strncmp(namecopy,"LOGIN",5))
X! status = US_LOGIN;
X! else if((!strncmp(namecopy,"uugetty",7) ||
X! !strncmp(namecopy,"getty",5)))
X {
X if(itmp = line_locked(line))
X status = US_DIALOUT;
X*** /u4/src/ecu3.01/z/Makefile Tue Dec 4 05:40:00 1990
X--- z/Makefile Tue Jan 8 04:38:50 1991
X***************
X*** 15,22
X
X .SUFFIXES: .o .c .h
X
X! SYSTEM = `sysdep =M_UNIX UNIX Sys V/386 =M_I386 Xenix/386 =M_I286 Xenix/286`
X! COMFLAGS = -i `sysdep =M_I386 -Octl -CSON =M_I286 -M2le -O -F 1000 -LARGE`
X CFLAGS = -c $(EXTRA) $(COMFLAGS) -DMD -DLINT_ARGS -DREADCHECK -DLOG_XFER -DM_TERMCAP
X
X LDFLAGS = -ltcap -ltermlib -lx
X
X--- 15,24 -----
X
X .SUFFIXES: .o .c .h
X
X! SYSTEM =\
X! `sysdep =M_UNIX UNIX Sys V/386 =M_I386 Xenix/386 =M_I286 Xenix/286 =ISC ISC`
X! COMFLAGS =\
X! `sysdep =M_I386 -Octl -CSON =M_I286 -M2le -O -F 1000 -LARGE =ISC -O`
X CFLAGS = -c $(EXTRA) $(COMFLAGS) -DMD -DLINT_ARGS -DREADCHECK -DLOG_XFER -DM_TERMCAP
X
X LDFLAGS = -ltcap -ltermlib -lx
X*** /u4/src/ecu3.01/z/zcurses.c Wed Dec 26 00:32:00 1990
X--- z/zcurses.c Fri Jan 4 15:54:30 1991
X***************
X*** 57,62
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X /*:12-18-1990-21:26-wht@n4hgf-better output control */
X /*:12-04-1990-04:07-wht@n4hgf-handle slow terminal using faster line */
X /*:12-04-1990-03:04-wht@n4hgf-choose ruling chars based on multiscreen or not */
X
X--- 57,63 -----
X
X ------------------------------------------------------------------------*/
X /*+:EDITS:*/
X+ /*:01-04-1991-15:54-wht@n4hgf-no_curses per-file xfer rate was wrong */
X /*:12-18-1990-21:26-wht@n4hgf-better output control */
X /*:12-04-1990-04:07-wht@n4hgf-handle slow terminal using faster line */
X /*:12-04-1990-03:04-wht@n4hgf-choose ruling chars based on multiscreen or not */
X***************
X*** 115,120
X int no_curses = 0;
X int no_curses_pos = 0;
X int this_file_errors;
X int total_errors;
X int show_window = 0;
X long current_seconds = 0;
X
X--- 116,122 -----
X int no_curses = 0;
X int no_curses_pos = 0;
X int this_file_errors;
X+ long this_file_xfer_count = 0;
X int total_errors;
X int show_window = 0;
X long current_seconds = 0;
X***************
X*** 1246,1251
X }
X
X this_file_start_seconds = time((long *)0);
X
X if(no_curses)
X {
X
X--- 1248,1254 -----
X }
X
X this_file_start_seconds = time((long *)0);
X+ this_file_xfer_count = 0;
X
X if(no_curses)
X {
X***************
X*** 1307,1312
X }
X
X this_file_start_seconds = time((long *)0);
X
X if(no_curses)
X {
X
X--- 1310,1316 -----
X }
X
X this_file_start_seconds = time((long *)0);
X+ this_file_xfer_count = 0;
X
X if(no_curses)
X {
X***************
X*** 1372,1378
X no_curses_pos +=
X printf("Transfer time was %s",get_elapsed_time(elapsed_seconds));
X no_curses_newline();
X! if(elapsed_seconds && (zcurses_baud_rate > 50))
X {
X rate = (float)total_data_chars_xfered / (float)elapsed_seconds;
X if(zcurses_baud_rate)
X
X--- 1376,1382 -----
X no_curses_pos +=
X printf("Transfer time was %s",get_elapsed_time(elapsed_seconds));
X no_curses_newline();
X! if(this_file_xfer_count && elapsed_seconds && zcurses_baud_rate)
X {
X rate = (float)this_file_xfer_count / (float)elapsed_seconds;
X if(zcurses_baud_rate)
X***************
X*** 1374,1380
X no_curses_newline();
X if(elapsed_seconds && (zcurses_baud_rate > 50))
X {
X! rate = (float)total_data_chars_xfered / (float)elapsed_seconds;
X if(zcurses_baud_rate)
X eff = 100.0 * (rate / ((float)zcurses_baud_rate / 10.0));
X }
X
X--- 1378,1384 -----
X no_curses_newline();
X if(this_file_xfer_count && elapsed_seconds && zcurses_baud_rate)
X {
X! rate = (float)this_file_xfer_count / (float)elapsed_seconds;
X if(zcurses_baud_rate)
X eff = 100.0 * (rate / ((float)zcurses_baud_rate / 10.0));
X }
X***************
X*** 1446,1451
X {
X
X total_data_chars_xfered += (long)count;
X
X if(no_curses)
X {
X
X--- 1450,1456 -----
X {
X
X total_data_chars_xfered += (long)count;
X+ this_file_xfer_count = count;
X
X if(no_curses)
X {
SHAR_EOF
chmod 0644 PATCH02.02 ||
echo 'restore of PATCH02.02 failed'
Wc_c="`wc -c < 'PATCH02.02'`"
test 28027 -eq "$Wc_c" ||
echo 'PATCH02.02: original size 28027, current size' "$Wc_c"
# ============= ecunumrev.c ==============
echo 'x - extracting ecunumrev.c (Text)'
sed 's/^X//' << 'SHAR_EOF' > 'ecunumrev.c' &&
X/*+-----------------------------------------------------------------------
X ecunumrev.c - revision numbers
X wht@n4hgf.Mt-Park.GA.US
X------------------------------------------------------------------------*/
X/*+:EDITS:*/
X/*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X#if defined(M_I286) && !defined(NO_SELECT)
X#define NO_SELECT
X#endif
X
X#ifdef WHT
Xchar *numeric_revision = "wht3";
X#else
X#ifdef SCO
Xchar *numeric_revision = "sco3";
X#else
X#ifdef __GNUC__
Xchar *numeric_revision = "gcc3";
X#else
Xchar *numeric_revision = "unet3";
X#endif
X#endif
X#endif
X
X#if defined(ISC)
Xchar *revision_modifier = "-386i wht@n4hgf";
X#else
X#if defined(M_UNIX)
Xchar *revision_modifier = "-386u wht@n4hgf";
X#else
X#if defined(M_I386)
X#if defined(NO_SELECT)
Xchar *revision_modifier = "-386n wht@n4hgf";
X#else
Xchar *revision_modifier = "-386s wht@n4hgf";
X#endif
X#else
Xchar *revision_modifier = "-286n wht@n4hgf";
X#endif /* M_I386 */
X#endif /* M_UNIX */
X#endif /* ISC */
X
X/* vi: set tabstop=4 shiftwidth=4: */
SHAR_EOF
chmod 0644 ecunumrev.c ||
echo 'restore of ecunumrev.c failed'
Wc_c="`wc -c < 'ecunumrev.c'`"
test 997 -eq "$Wc_c" ||
echo 'ecunumrev.c: original size 997, current size' "$Wc_c"
# ============= ecuvmin.h ==============
echo 'x - extracting ecuvmin.h (Text)'
sed 's/^X//' << 'SHAR_EOF' > 'ecuvmin.h' &&
X/*+-------------------------------------------------------------------------
X xenixvmin.h -- set line default VMIN
X wht@n4hgf.Mt-Park.GA.US
X--------------------------------------------------------------------------*/
X/*+:EDITS:*/
X/*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
X
X#if defined(BUILDING_PROTOTYPES) /* if building lint_args.h ... */
X#define XENIX_VMIN 2 /* ... include vmin handling routines */
X#else
X#define XENIX_VMIN 1 /* this is the real value for vmin */
X#endif
X/* vi: set tabstop=4 shiftwidth=4: */
SHAR_EOF
chmod 0644 ecuvmin.h ||
echo 'restore of ecuvmin.h failed'
Wc_c="`wc -c < 'ecuvmin.h'`"
test 538 -eq "$Wc_c" ||
echo 'ecuvmin.h: original size 538, current size' "$Wc_c"
# ============= patchlevel.h ==============
echo 'x - extracting patchlevel.h (Text)'
sed 's/^X//' << 'SHAR_EOF' > 'patchlevel.h' &&
X#define PATCHLEVEL 2
SHAR_EOF
chmod 0644 patchlevel.h ||
echo 'restore of patchlevel.h failed'
Wc_c="`wc -c < 'patchlevel.h'`"
test 21 -eq "$Wc_c" ||
echo 'patchlevel.h: original size 21, current size' "$Wc_c"
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.