Usenet 1994 January

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / misc / volume13 / ecu2.80 / patch03 < prev next >

Wrap

Text File | 1990-05-25 | 13.0 KB | 488 lines

Newsgroups: comp.sources.misc subject: v13i003: ECU 2.80 patch 3 From: wht@gatech.edu@n4hgf.UUCP (Warren Tucker) Sender: allbery@uunet.UU.NET (Brandon S. Allbery - comp.sources.misc) Posting-number: Volume 13, Issue 3 Submitted-by: wht@gatech.edu@n4hgf.UUCP (Warren Tucker) Archive-name: ecu2.80/patch03 This patch applies changes to the file transfer programs. 1. The transfer efficiency was being displayed as .XX% instead of XX%. 2. Some unused code was removed. 3. I found several places where I misspelled Chuck Forsberg's name (sorry Chuck). Apply the patch by unsharing this package and typing APPLY.P03. Patches 1 and 2 must have been applied. Then, make su make install #!/bin/sh # This is ecu2.80/patch03, a shell archive (shar 3.27) # made 05/23/1990 10:44 UTC by wht%n4hgf@gatech.edu # Source directory /u1/src/ecu # # existing files WILL be overwritten # # This shar contains: # length mode name # ------ ---------- ------------------------------------------ # 440 -rwxr-xr-x APPLY.P03 # 10652 -rw-r--r-- ECU280.P03 # if touch 2>&1 | fgrep 'mmdd' > /dev/null then TOUCH=touch else TOUCH=true fi # ============= APPLY.P03 ============== echo "x - extracting APPLY.P03 (Text)" sed 's/^X//' << 'SHAR_EOF' > APPLY.P03 && X: X#-------------------------------------------------------------- X# APPLY.P03 - ensure patch 2 already applied and apply patch 3 X#-------------------------------------------------------------- Xif fgrep 'PATCHLEVEL 2' patchlevel.h > /dev/null 2>&1 X then X echo 'Applying patch 3'; X else X echo 'You must apply patch 2 first (or patch 3 already applied)'; X exit 1; Xfi Xpatch -p < ECU280.P03 Xcat > patchlevel.h << PLEOF X#define PATCHLEVEL 3 XPLEOF Xexit 0 SHAR_EOF $TOUCH -am 0523062790 APPLY.P03 && chmod 0755 APPLY.P03 || echo "restore of APPLY.P03 failed" # ============= ECU280.P03 ============== echo "x - extracting ECU280.P03 (Text)" sed 's/^X//' << 'SHAR_EOF' > ECU280.P03 && X#------------------------------------------------------- X# ECU380.P031 - transfer program fixes X# created by gendiff x1.03 on 23 May 1990 10:23 UTC X#------------------------------------------------------- X*** /u4/ecurel/z/ecurz.c Wed May 23 06:02:40 1990 X--- z/ecurz.c Mon May 21 19:08:40 1990 X*************** X*** 1,5 X /* CHK=0x459E */ X! char *numeric_revision = "ecurz 2.38"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X Derived from public domain source by Chuck Foresberg, Omen Technologies X X--- 1,5 ----- X /* CHK=0x459E */ X! char *numeric_revision = "ecurz 2.40"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X Derived from public domain source by Chuck Forsberg, Omen Technologies X*************** X*** 2,8 X char *numeric_revision = "ecurz 2.38"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X! Derived from public domain source by Chuck Foresberg, Omen Technologies X Adaptation for ecu Copyright 1989, Warren H. Tucker, III X X Defined functions: X X--- 2,8 ----- X char *numeric_revision = "ecurz 2.40"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X! Derived from public domain source by Chuck Forsberg, Omen Technologies X Adaptation for ecu Copyright 1989, Warren H. Tucker, III X X Defined functions: X*************** X*** 877,883 X register n; X static unsigned char *cdq; /* pointer for removing chars from linbuf */ X X- #ifndef bad_problem X if(--Lleft >= 0) X return(*cdq++); X X X--- 877,882 ----- X register n; X static unsigned char *cdq; /* pointer for removing chars from linbuf */ X X if(--Lleft >= 0) X return(*cdq++); X X*************** X*** 900,946 X X --Lleft; X return(*cdq++); X- #else X- int rtnv; X- X- if(--Lleft >= 0) X- { X- rtnv = *cdq++; X- goto LOG_AND_RETURN; X- } X- X- n = timeout/10; X- if(n < 2) X- n = 3; X- if(setjmp(tohere)) X- { X- Lleft = 0; X- rtnv = *cdq++; X- goto LOG_AND_RETURN; X- } X- signal(SIGALRM,SIGALRM_handler); X- alarm(n); X- Lleft = read(iofd,cdq = linbuf,Readnum); X- alarm(0); X- rx_char_count += Lleft; X- X- if(Lleft < 1) X- { X- rtnv = TIMEOUT; X- goto LOG_AND_RETURN; X- } X- --Lleft; X- rtnv = *cdq++; X- X- LOG_AND_RETURN: X- if(log_packets) X- { X- sprintf(s128,"rl: l=%3d ch=%x\n",Lleft,rtnv); X- write(log_packets,s128,strlen(s128)); X- } X- return(rtnv); X- X- #endif X X } /* end of readline */ X X X--- 899,904 ----- X X --Lleft; X return(*cdq++); X X } /* end of readline */ X X*** /u4/ecurel/z/ecusz.c Wed May 23 06:02:42 1990 X--- z/ecusz.c Mon May 21 19:08:47 1990 X*************** X*** 1,5 X /* CHK=0x89BB */ X! char *numeric_revision = "ecusz 2.38"; X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X X--- 1,5 ----- X /* CHK=0x89BB */ X! char *numeric_revision = "ecusz 2.40"; X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X*************** X*** 3,9 X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X! Derived from public domain source by Chuck Foresberg, Omen Technologies X Adaptation for ecu Copyright 1989, Warren H. Tucker, III X X Usage: ecusz [-X -Y -Z] [-12+abdefkLlNnquvwy] [-] file ... X X--- 3,9 ----- X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X! Derived from public domain source by Chuck Forsberg, Omen Technologies X Adaptation for ecu Copyright 1989, Warren H. Tucker, III X X Usage: ecusz [-X -Y -Z] [-12+abdefkLlNnquvwy] [-] file ... X*************** X*** 67,72 X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X /*:05-14-1990-20:10-wht@n4hgf-log_packets i/o occurred before log open */ X /*:05-14-1990-16:17-wht@n4hgf-show open window size */ X /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ X X--- 67,73 ----- X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:05-18-1990-12:57-wht@n4hgf-report changes in block length */ X /*:05-14-1990-20:10-wht@n4hgf-log_packets i/o occurred before log open */ X /*:05-14-1990-16:17-wht@n4hgf-show open window size */ X /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ X*************** X*** 1498,1503 X for(;;) X { X blklen = blklen_original; X Txhdr[ZF0] = Lzconv; /* file conversion request */ X Txhdr[ZF1] = Lzmanag; /* file management request */ X Txhdr[ZF2] = Lztrans; /* file transport request */ X X--- 1499,1505 ----- X for(;;) X { X blklen = blklen_original; X+ report_txblklen(blklen); X Txhdr[ZF0] = Lzconv; /* file conversion request */ X Txhdr[ZF1] = Lzmanag; /* file management request */ X Txhdr[ZF2] = Lztrans; /* file transport request */ X*************** X*** 1646,1651 X if(blklen == bad_condx_blklen) X bad_condx_blklen = 0; X else X blklen *= 2; X SameZrposAgain = 0; X } X X--- 1648,1654 ----- X if(blklen == bad_condx_blklen) X bad_condx_blklen = 0; X else X+ { X blklen *= 2; X report_txblklen(blklen); X } X*************** X*** 1647,1652 X bad_condx_blklen = 0; X else X blklen *= 2; X SameZrposAgain = 0; X } X } X X--- 1650,1657 ----- X else X { X blklen *= 2; X+ report_txblklen(blklen); X+ } X SameZrposAgain = 0; X } X } X*************** X*** 1779,1784 X if(bad_condx_blklen == 0) /* wht */ X bad_condx_blklen = blklen; /* wht */ X if(blklen > 256) /* wht - 32->256 */ X blklen /= 2; /* wht - original code */ X } /* wht */ X } /* wht - original code */ X X--- 1784,1790 ----- X if(bad_condx_blklen == 0) /* wht */ X bad_condx_blklen = blklen; /* wht */ X if(blklen > 256) /* wht - 32->256 */ X+ { X blklen /= 2; /* wht - original code */ X report_txblklen(blklen); X } X*************** X*** 1780,1785 X bad_condx_blklen = blklen; /* wht */ X if(blklen > 256) /* wht - 32->256 */ X blklen /= 2; /* wht - original code */ X } /* wht */ X } /* wht - original code */ X Lastsync = Rxpos; X X--- 1786,1793 ----- X if(blklen > 256) /* wht - 32->256 */ X { X blklen /= 2; /* wht - original code */ X+ report_txblklen(blklen); X+ } X } /* wht */ X } /* wht - original code */ X Lastsync = Rxpos; X*** /u4/ecurel/z/zcommon.c Mon May 7 23:33:00 1990 X--- z/zcommon.c Mon May 21 17:24:25 1990 X*************** X*** 1,7 X /* CHK=0x052B */ X /*+------------------------------------------------------------------------- X zcommon.c - ecurz/ecusz common code X! derived from public domain code by Chuck Forsburg X ecu adaptation wht%n4hgf@gatech.edu X X Defined functions: X X--- 1,7 ----- X /* CHK=0x052B */ X /*+------------------------------------------------------------------------- X zcommon.c - ecurz/ecusz common code X! derived from public domain code by Chuck Forsberg X ecu adaptation wht%n4hgf@gatech.edu X X Defined functions: X*************** X*** 359,365 X ioctl(TIOCLBIS,&Locbit); X #endif X /* un-raw doesn't work w/o lit out *//*wht code was 99 */ X! cancel_transaction(0) X did0 = TRUE; X return(OK); X case 1: X X--- 359,365 ----- X ioctl(TIOCLBIS,&Locbit); X #endif X /* un-raw doesn't work w/o lit out *//*wht code was 99 */ X! cancel_transaction(0); X did0 = TRUE; X return(OK); X case 1: X*************** X*** 431,438 X int currdir_max; X { X #if defined(pyr) X! char *getwd(); X! return((getwd(currdir) == (char *)0) ? -1 : 0); X #endif X X #if defined(M_SYS5) X X--- 431,437 ----- X int currdir_max; X { X #if defined(pyr) X! getwd(currdir); X #endif X X #if defined(M_SYS5) X*** /u4/ecurel/z/zcurses.c Wed May 23 06:02:46 1990 X--- z/zcurses.c Mon May 21 19:07:28 1990 X*************** X*** 410,416 X { X rate = (float)total_data_chars_xfered / (float)elapsed_seconds; X if(zcurses_baud_rate) X! eff = rate / ((float)zcurses_baud_rate / 10.0); X } X if(rate > 0.01) X { X X--- 410,416 ----- 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 if(rate > 0.01) X { X*************** X*** 414,421 X } X if(rate > 0.01) X { X! sprintf(s128,"Transfer rate ~= %.0f ch/sec (%.2f%%)", X! rate,(eff > 0.005) ? eff : 0.0); X if(log_packets) X { X write(log_packets,"info: ",6); X X--- 414,421 ----- X } X if(rate > 0.01) X { X! sprintf(s128,"Transfer rate ~= %.0f ch/sec (%.0f%%)", X! rate,(eff > 0.5) ? eff : 0.0); X if(log_packets) X { X write(log_packets,"info: ",6); X*** /u4/ecurel/z/zlint.h Tue May 8 02:41:00 1990 X--- z/zlint.h Mon May 21 01:29:19 1990 X*************** X*** 1,4 X! /* CHK=0x545A */ X /*+----------------------------------------------------------------------- X zlint.h X ------------------------------------------------------------------------*/ X X--- 1,4 ----- X! /* CHK=0xE9E3 */ X /*+----------------------------------------------------------------------- X zlint.h X ------------------------------------------------------------------------*/ X*************** X*** 3,9 X zlint.h X ------------------------------------------------------------------------*/ X /*+:EDITS:*/ X! /*:05-08-1990-02:41-afterlint-creation */ X X #ifndef BUILDING_LINT_ARGS X #ifdef LINT_ARGS X X--- 3,9 ----- X zlint.h X ------------------------------------------------------------------------*/ X /*+:EDITS:*/ X! /*:05-21-1990-01:29-afterlint-creation */ X X #ifndef BUILDING_LINT_ARGS X #ifdef LINT_ARGS X*************** X*** 48,53 X void report_txblklen(int ); X void report_txpos(long ); X void report_uninit(int ); X /* zdebug.c */ X /* zmodem.c */ X int noxrd7(void ); X X--- 48,54 ----- X void report_txblklen(int ); X void report_txpos(long ); X void report_uninit(int ); X+ void report_window(void ); X /* zdebug.c */ X /* zmodem.c */ X int noxrd7(void ); X*************** X*** 96,101 X void report_txblklen(); X void report_txpos(); X void report_uninit(); X /* zdebug.c */ X /* zmodem.c */ X long rclhdr(); X X--- 97,103 ----- X void report_txblklen(); X void report_txpos(); X void report_uninit(); X+ void report_window(); X /* zdebug.c */ X /* zmodem.c */ X long rclhdr(); SHAR_EOF $TOUCH -am 0523062990 ECU280.P03 && chmod 0644 ECU280.P03 || echo "restore of ECU280.P03 failed" set `wc -c ECU280.P03`;Wc_c=$1 if test "$Wc_c" != "10652"; then echo original size 10652, current size $Wc_c fi exit 0