From pa.dec.com!shlump.nac.dec.com!lemans.dec.com!decuac!haven!uflorida!caen!zaphod.mps.ohio-state.edu!samsung!uunet!sparky!kent Wed Feb 20 15:24:43 PST 1991 Article: 2043 of comp.sources.misc Path: pa.dec.com!shlump.nac.dec.com!lemans.dec.com!decuac!haven!uflorida!caen!zaphod.mps.ohio-state.edu!samsung!uunet!sparky!kent From: wht@n4hgf (Warren Tucker) Newsgroups: comp.sources.misc Subject: v16i098: ECU 3 Patch 5, Part 2 of 2 Message-ID: <1991Feb11.004624.2785@sparky.IMD.Sterling.COM> Date: 11 Feb 91 00:46:24 GMT Sender: kent@sparky.IMD.Sterling.COM (Kent Landfield) Organization: Sterling Software, IMD Lines: 432 Approved: kent@sparky.imd.sterling.com X-Checksum-Snefru: 6e79b528 766cdbdb 406316b3 ef92c366 Submitted-by: wht@n4hgf.Mt-Park.GA.US (Warren Tucker) Posting-number: Volume 16, Issue 98 Archive-name: ecu3/patch05b Patch-To: ecu3: Volume 16, Issue 25-59 #!/bin/sh # This is ecu3/patch05b, a shell archive (shar 3.46) # made 02/08/1991 08:39 UTC by wht@n4hgf # Source directory /u1/src/ecu # # existing files WILL be overwritten # # This shar contains: # length mode name # ------ ---------- ------------------------------------------ # 10666 -rw-r--r-- PATCH5.02 # # ============= PATCH5.02 ============== echo 'x - extracting PATCH5.02 (Text)' sed 's/^X//' << 'SHAR_EOF' > 'PATCH5.02' && X: X#------------------------------------------------------- X# PATCH5.02 X# created by gendiff x1.03 on 08 Feb 1991 08:25 UTC X#------------------------------------------------------- X*** /u4/src/ecu3.04/feval.c Wed Dec 26 02:32:00 1990 X--- feval.c Thu Jan 31 16:27:42 1991 X*************** X*** 19,24 X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X /*:12-24-1990-04:31-wht@n4hgf-experimental esio driver functions */ X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */ X X X--- 19,25 ----- X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:01-31-1991-16:10-wht@n4hgf-was freeing tesd1 twice in feval_str */ X /*:12-24-1990-04:31-wht@n4hgf-experimental esio driver functions */ X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */ X X*************** X*** 894,900 X break; X if(erc = skip_paren(param,0)) X break; X! cptr = mode_map((int)ltmp,(char *)0); X itmp = strlen(cptr); X goto CPTR_ITMP_COMMON; X X X--- 895,901 ----- X break; X if(erc = skip_paren(param,0)) X break; X! cptr = mode_map((ushort)ltmp,(char *)0); X itmp = strlen(cptr); X goto CPTR_ITMP_COMMON; X X*************** X*** 1216,1222 X null_terminate_esd(result_esd); X free_esd(tesd1); X if(tesd2) X! free_esd(tesd1); X return(erc); X X } /* end of feval_str() */ X X--- 1217,1223 ----- X null_terminate_esd(result_esd); X free_esd(tesd1); X if(tesd2) X! free_esd(tesd2); X return(erc); X X } /* end of feval_str() */ X*** /u4/src/ecu3.04/gint.c Fri Feb 8 03:21:21 1991 X--- gint.c Thu Jan 31 16:50:57 1991 X*************** X*** 11,16 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 X--- 11,17 ----- X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:01-31-1991-16:50-wht@n4hgf-reinstate octal with 0o prefix */ 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*************** X*** 57,64 X base = BASE_HEX; X param->index += 2; X } X! #ifdef WANT_OCT X! else if(*(param->pb + param->index) == '0') X base = BASE_OCT; X #endif X X X--- 58,66 ----- X base = BASE_HEX; X param->index += 2; X } X! else if((!strncmp(param->pb + param->index,"0o",2)) || X! (!strncmp(param->pb + param->index,"0O",2))) X! { X base = BASE_OCT; X param->index += 2; X } X*************** X*** 60,66 X #ifdef WANT_OCT X else if(*(param->pb + param->index) == '0') X base = BASE_OCT; X! #endif X X param->old_index = param->index; X switch(base) X X--- 62,69 ----- X (!strncmp(param->pb + param->index,"0O",2))) X { X base = BASE_OCT; X! param->index += 2; X! } X X param->old_index = param->index; X switch(base) X*************** X*** 76,82 X itmp = param->index + strspn(param->pb + param->index,"0123456789"); X erc = eInvalidDecNumber; X break; X- #ifdef WANT_OCT X case BASE_OCT: X sscanf(param->pb + param->index,"%lo",&new_value); X itmp = param->index + strspn(param->pb + param->index,"01234567"); X X--- 79,84 ----- X itmp = param->index + strspn(param->pb + param->index,"0123456789"); X erc = eInvalidDecNumber; X break; X case BASE_OCT: X sscanf(param->pb + param->index,"%lo",&new_value); X itmp = param->index + strspn(param->pb + param->index,"01234567"); X*************** X*** 82,88 X itmp = param->index + strspn(param->pb + param->index,"01234567"); X erc = eInvalidOctNumber; X break; X- #endif X } X X param->index = itmp; X X--- 84,89 ----- X itmp = param->index + strspn(param->pb + param->index,"01234567"); X erc = eInvalidOctNumber; X break; X } X X param->index = itmp; X*** /u4/src/ecu3.04/gstr.c Mon Dec 24 22:38:00 1990 X--- gstr.c Thu Jan 31 17:18:37 1991 X*************** X*** 185,191 X break; X X default: X- null_terminate_esd(result); X erc = 0; X if((param->index < param->cb) && X isalnum(*(param->pb + param->index))) X X--- 185,190 ----- X break; X X default: X erc = 0; X if((param->index < param->cb) && X isalnum(*(param->pb + param->index))) X*** /u4/src/ecu3.04/models/sf_test.ep Mon Aug 13 17:05:00 1990 X--- models/sf_test.ep Thu Jan 31 16:48:36 1991 X*************** X*** 87,90 X echo '' X echo 'errno 1 = "'+%errstr(1)+'"' X echo '5678 seconds is "'+%etime(5678)+'"' X! echo 'mode 105755 is "'+%fmodestr(0105755)+'"' X X--- 87,90 ----- X echo '' X echo 'errno 1 = "'+%errstr(1)+'"' X echo '5678 seconds is "'+%etime(5678)+'"' X! echo 'mode 105755 is "'+%fmodestr(0o105755)+'"' X*** /u4/src/ecu3.04/proc.c Mon Dec 24 22:43:00 1990 X--- proc.c Thu Jan 31 13:20:14 1991 X*************** X*** 28,34 X /*+:EDITS:*/ X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */ X X- #include X #include "ecu.h" X #include "ecuerror.h" X #include "esd.h" X X--- 28,33 ----- X /*+:EDITS:*/ X /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */ X X #include "ecu.h" X #include "ecuerror.h" X #include "esd.h" X*** /u4/src/ecu3.04/z/ecurz.c Sun Dec 23 02:16:00 1990 X--- z/ecurz.c Sun Feb 3 17:27:51 1991 X*************** X*** 1,4 X! char *numeric_revision = "ecurz 3.04"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X Derived from public domain source by Chuck Forsberg, Omen Technologies X X--- 1,4 ----- X! char *numeric_revision = "ecurz 3.05"; X /*+------------------------------------------------------------------------- X ecurz.c - X/Y/ZMODEM receive program X Derived from public domain source by Chuck Forsberg, Omen Technologies X*************** X*** 57,62 X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X /*:12-18-1990-21:26-wht@n4hgf-better output control */ X /*:10-04-1990-14:01-wht@n4hgf-add file finish warning for me */ X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */ X X--- 57,63 ----- X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:02-03-1991-17:27-wht@n4hgf-version number change - see zcurses.c */ X /*:12-18-1990-21:26-wht@n4hgf-better output control */ X /*:10-04-1990-14:01-wht@n4hgf-add file finish warning for me */ X /*:09-19-1990-19:36-wht@n4hgf-ecu_log_event now gets pid for log from caller */ X*** /u4/src/ecu3.04/z/ecusz.c Thu Dec 20 17:05:00 1990 X--- z/ecusz.c Sun Feb 3 17:28:04 1991 X*************** X*** 1,4 X! char *numeric_revision = "ecusz 3.04"; X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X X--- 1,4 ----- X! char *numeric_revision = "ecusz 3.05"; X #define BUFFERED_WRITE X /*+------------------------------------------------------------------------- X ecusz.c - X/Y/ZMODEM send program X*************** X*** 66,71 X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X /*:12-18-1990-21:26-wht@n4hgf-better output control */ 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--- 66,72 ----- X X --------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:02-03-1991-17:27-wht@n4hgf-version number change - see zcurses.c */ X /*:12-18-1990-21:26-wht@n4hgf-better output control */ 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*** /u4/src/ecu3.04/z/zcurses.c Fri Feb 8 03:21:29 1991 X--- z/zcurses.c Sun Feb 3 17:41:51 1991 X*************** X*** 57,62 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 X--- 57,63 ----- X X ------------------------------------------------------------------------*/ X /*+:EDITS:*/ X+ /*:02-03-1991-17:27-wht@n4hgf-show elapsed time during no curses xfer */ 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*************** X*** 680,685 X report_rx_ind(status) X int status; X { X if(no_curses) X { X if(report_verbosity && status) X X--- 681,688 ----- X report_rx_ind(status) X int status; X { X+ char *cptr; X+ X if(no_curses) X { X if(report_verbosity && status) X*************** X*** 686,691 X { X printf("R"); X if(++no_curses_pos > 75) X no_curses_newline(); X fflush(stdout); X } X X--- 689,695 ----- X { X printf("R"); X if(++no_curses_pos > 75) X+ { X no_curses_newline(); X current_seconds = time((long *)0); X elapsed_seconds = current_seconds - this_file_start_seconds; X*************** X*** 687,692 X printf("R"); X if(++no_curses_pos > 75) X no_curses_newline(); X fflush(stdout); X } X return; X X--- 691,701 ----- X if(++no_curses_pos > 75) X { X no_curses_newline(); X+ current_seconds = time((long *)0); X+ elapsed_seconds = current_seconds - this_file_start_seconds; X+ cptr = get_elapsed_time(elapsed_seconds); X+ no_curses_pos = printf("%s elapsed ",cptr + 3); X+ } X fflush(stdout); X } X return; X*************** X*** 704,709 X report_tx_ind(status) X int status; X { X if(no_curses) X { X if(report_verbosity && status) X X--- 713,719 ----- X report_tx_ind(status) X int status; X { X+ char *cptr; X if(no_curses) X { X if(report_verbosity && status) X*************** X*** 710,715 X { X printf("T"); X if(++no_curses_pos > 75) X no_curses_newline(); X fflush(stdout); X } X X--- 720,726 ----- X { X printf("T"); X if(++no_curses_pos > 75) X+ { X no_curses_newline(); X no_curses_newline(); X current_seconds = time((long *)0); X*************** X*** 711,716 X printf("T"); X if(++no_curses_pos > 75) X no_curses_newline(); X fflush(stdout); X } X return; X X--- 722,733 ----- X if(++no_curses_pos > 75) X { X no_curses_newline(); X+ no_curses_newline(); X+ current_seconds = time((long *)0); X+ elapsed_seconds = current_seconds - this_file_start_seconds; X+ cptr = get_elapsed_time(elapsed_seconds); X+ no_curses_pos = printf("%s elapsed ",cptr + 3); X+ } X fflush(stdout); X } X return; SHAR_EOF chmod 0644 PATCH5.02 || echo 'restore of PATCH5.02 failed' Wc_c="`wc -c < 'PATCH5.02'`" test 10666 -eq "$Wc_c" || echo 'PATCH5.02: original size 10666, 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.