From decwrl!wyse!mips!zaphod.mps.ohio-state.edu!uakari.primate.wisc.edu!aplcen!uunet!allbery Sat May 19 20:36:50 PDT 1990 Article 1584 of comp.sources.misc: Path: decwrl!wyse!mips!zaphod.mps.ohio-state.edu!uakari.primate.wisc.edu!aplcen!uunet!allbery From: wht%n4hgf@gatech.edu (Warren Tucker) Newsgroups: comp.sources.misc Subject: v12i102: ECU patch 1 part 02/02 Message-ID: <89108@uunet.UU.NET> Date: 17 May 90 00:40:35 GMT Sender: allbery@uunet.UU.NET Lines: 1335 Approved: allbery@uunet.UU.NET (Brandon S. Allbery - comp.sources.misc) Posting-number: Volume 12, Issue 102 Submitted-by: wht%n4hgf@gatech.edu (Warren Tucker) Archive-name: ecu2.80/patch01contd #!/bin/sh # This is part 02 of ecu2.80/patch01. if touch 2>&1 | fgrep '[-amc]' > /dev/null then TOUCH=touch else TOUCH=true fi # ============= ECU280.P1.02 ============== echo "x - extracting ECU280.P1.02 (Text)" sed 's/^X//' << 'SHAR_EOF' > ECU280.P1.02 && X: X#------------------------------------------------------- X# ECU280.P1.02 X# created by gendiff x1.03 on 16 May 1990 06:10 UTC X#------------------------------------------------------- Xsed -e 's/^P//' << DIFF_EOF | patch -p XP*** /u4/ecurel/ecusighdl.c Mon May 7 23:33:00 1990 XP--- ecusighdl.c Sun May 13 16:22:29 1990 XP*************** XP*** 25,30 XP XP ------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:23-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:04-10-1990-17:34-wht@n4hgf-provisions for ecu xmtr logging when rcvr dead */ XP XP--- 25,32 ----- XP XP ------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-13-1990-16:21-wht@n4hgf-log -s got stuck, rcvr_log_append now set to 1 */ XP+ /*:05-11-1990-14:07-wht@n4hgf-make XMTR&RCVR ignore SIGQUIT - kermit uses ^\ */ XP /*:05-07-1990-21:23-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:04-10-1990-17:34-wht@n4hgf-provisions for ecu xmtr logging when rcvr dead */ XP*************** XP*** 51,56 XP extern int rcvr_log; XP extern FILE *rcvr_log_fp; XP extern char rcvr_log_file[]; /* if rcvr_log!= 0,log filename */ XP XP int interrupt = 0; /* interrupt indicator */ XP int proc_interrupt = 0; /* procedure interrupt indicator */ XP XP--- 53,59 ----- XP extern int rcvr_log; XP extern FILE *rcvr_log_fp; XP extern char rcvr_log_file[]; /* if rcvr_log!= 0,log filename */ XP+ extern int rcvr_log_append; XP XP int interrupt = 0; /* interrupt indicator */ XP int proc_interrupt = 0; /* procedure interrupt indicator */ XP*************** XP*** 114,119 XP sprintf(s40,"DEBUG rcvr pid %d",rcvr_pid); XP ecu_log_event(s40); /* rcvr */ XP #endif XP xmtr_signals(); XP return(rcvr_pid); XP } XP XP--- 117,124 ----- XP sprintf(s40,"DEBUG rcvr pid %d",rcvr_pid); XP ecu_log_event(s40); /* rcvr */ XP #endif XP+ if(rcvr_log) XP+ rcvr_log_append = 1; /* until next %log -s */ XP xmtr_signals(); XP return(rcvr_pid); XP } XP*************** XP*** 417,423 XP xmtr_signals() XP { XP signal(SIGHUP,xmtr_SIGHUP_handler); XP! signal(SIGQUIT,SIG_DFL); XP signal(SIGINT,xmtr_SIGINT_handler); XP signal(SIGTERM,xmtr_SIGTERM_handler); XP signal(SIGCLD,xmtr_SIGCLD_handler); XP XP--- 422,428 ----- XP xmtr_signals() XP { XP signal(SIGHUP,xmtr_SIGHUP_handler); XP! signal(SIGQUIT,SIG_IGN); XP signal(SIGINT,xmtr_SIGINT_handler); XP signal(SIGTERM,xmtr_SIGTERM_handler); XP signal(SIGCLD,xmtr_SIGCLD_handler); XP*************** XP*** 431,437 XP rcvr_signals() XP { XP signal(SIGHUP,rcvr_SIGHUP_handler); XP! signal(SIGQUIT,SIG_DFL); XP signal(SIGTERM,rcvr_SIGTERM_handler); XP signal(SIGINT,rcvr_SIGINT_handler); XP signal(SIGUSR1,rcvr_SIGUSR1_handler); XP XP--- 436,442 ----- XP rcvr_signals() XP { XP signal(SIGHUP,rcvr_SIGHUP_handler); XP! signal(SIGQUIT,SIG_IGN); XP signal(SIGTERM,rcvr_SIGTERM_handler); XP signal(SIGINT,rcvr_SIGINT_handler); XP signal(SIGUSR1,rcvr_SIGUSR1_handler); XP*** /u4/ecurel/ecuxfer.c Mon May 7 23:33:00 1990 XP--- ecuxfer.c Mon May 14 13:50:48 1990 XP*************** XP*** 36,41 XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:03-27-1990-15:18-wht@n4hgf-overhaul for/wait/SIGCLD handling */ XP XP--- 36,42 ----- XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-14-1990-13:28-wht@n4hgf-add window size choice to sz */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:03-27-1990-15:18-wht@n4hgf-overhaul for/wait/SIGCLD handling */ XP*************** XP*** 96,101 XP #define SNDW_XFRNEW_LX 3 XP #define SNDW_XFRNEW_X 30 XP XP extern char curr_dir[]; /* current working directory */ XP extern int protocol_log_packets; XP extern int last_child_wait_status; XP XP--- 97,107 ----- XP #define SNDW_XFRNEW_LX 3 XP #define SNDW_XFRNEW_X 30 XP XP+ #define SNDW_ZWINDW_Y 9 XP+ #define SNDW_ZWINDW_LX 3 XP+ #define SNDW_ZWINDW_X 16 XP+ #define SNDW_ZWINDW_LEN 6 XP+ XP extern char curr_dir[]; /* current working directory */ XP extern int protocol_log_packets; XP extern int last_child_wait_status; XP*************** XP*** 112,117 XP char p_overwrite; XP char p_xfernew; XP char p_filelist[80]; XP XP /*+------------------------------------------------------------------------- XP file_xfer_start() XP XP--- 118,124 ----- XP char p_overwrite; XP char p_xfernew; XP char p_filelist[80]; XP+ int zwindw_size; XP XP /*+------------------------------------------------------------------------- XP file_xfer_start() XP*************** XP*** 280,285 XP waddstr(xfrw,"Transfer only newer files:"); XP wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_LX); XP waddstr(xfrw,"Send full pathames:"); XP case CKERMIT: XP wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_LX); XP waddstr(xfrw,"Overwrite destination files:"); XP XP--- 287,294 ----- XP waddstr(xfrw,"Transfer only newer files:"); XP wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_LX); XP waddstr(xfrw,"Send full pathames:"); XP+ wmove(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_LX); XP+ waddstr(xfrw,"Window size:"); XP case CKERMIT: XP wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_LX); XP waddstr(xfrw,"Overwrite destination files:"); XP*************** XP*** 336,341 XP void XP xfrws_display_allvars() XP { XP xfrws_display_name(); XP switch(xfertype) XP { XP XP--- 345,352 ----- XP void XP xfrws_display_allvars() XP { XP+ char s16[16]; XP+ XP xfrws_display_name(); XP switch(xfertype) XP { XP*************** XP*** 343,348 XP xfrws_display_xfernew(); XP wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_X); XP waddch(xfrw,(p_sendfull) ? 'Y' : 'N'); XP case CKERMIT: XP wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_X); XP waddch(xfrw,(p_overwrite) ? 'Y' : 'N'); XP XP--- 354,362 ----- XP xfrws_display_xfernew(); XP wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_X); XP waddch(xfrw,(p_sendfull) ? 'Y' : 'N'); XP+ wmove(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X); XP+ sprintf(s16,"%d",zwindw_size); XP+ waddstr(xfrw,s16); XP case CKERMIT: XP wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_X); XP waddch(xfrw,(p_overwrite) ? 'Y' : 'N'); XP*************** XP*** 450,455 XP p_overwrite = 1; /* assume overwrite */ XP p_xfernew = 0; /* assume send only newer */ XP p_filelist[0] = 0; /* no filenames yet */ XP XP switch(to_lower(*(argv[0] + 1))) XP { XP XP--- 464,470 ----- XP p_overwrite = 1; /* assume overwrite */ XP p_xfernew = 0; /* assume send only newer */ XP p_filelist[0] = 0; /* no filenames yet */ XP+ zwindw_size = 0; /* assume full streaming sz */ XP XP switch(to_lower(*(argv[0] + 1))) XP { XP*************** XP*** 479,485 XP xfrw_lines = 9; XP break; XP case ECUSZ_Z: XP! input_state_mod = 5; XP case CKERMIT: XP if(!input_state_mod) XP input_state_mod = 3; XP XP--- 494,500 ----- XP xfrw_lines = 9; XP break; XP case ECUSZ_Z: XP! input_state_mod = 6; XP case CKERMIT: XP if(!input_state_mod) XP input_state_mod = 3; XP*************** XP*** 621,627 XP } XP break; XP XP! case 4: /* resume interrupted transfer */ XP XP xfrw_bot_msg( XP "Y: send only if source newer than destination, N send all"); XP XP--- 636,642 ----- XP } XP break; XP XP! case 4: /* src newer than dest */ XP XP xfrw_bot_msg( XP "Y: send only if source newer than destination, N send all"); XP*************** XP*** 641,646 XP } XP break; XP XP } XP XP switch(delim) XP XP--- 656,687 ----- XP } XP break; XP XP+ case 5: /* window size */ XP+ XP+ xfrw_bot_msg( XP+ "window size (bytes transferred before ACK) 0 = stream"); XP+ sprintf(s80,"%d",zwindw_size); XP+ itmp = wingets(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X,s80, XP+ SNDW_ZWINDW_LEN + 1,&delim,1); XP+ if(delim == ESC) XP+ break; XP+ if(strlen(s80)) XP+ { XP+ if(((itmp = atoi(s80)) < 0) || XP+ ((itmp < 256) || (itmp > 65536))) XP+ { XP+ ring_bell(); XP+ xfrw_bot_msg( XP+ "window size must be 0 or 256 <= w <= 65536"); XP+ continue; XP+ } XP+ zwindw_size = atoi(s80); XP+ sprintf(s80,"%d",zwindw_size); XP+ clear_area(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X, XP+ SNDW_ZWINDW_LEN); XP+ waddstr(xfrw,s80); XP+ } XP+ break; XP } XP XP switch(delim) XP*************** XP*** 730,735 XP case ECUSZ_Z: XP sprintf(execcmd,"ecusz -Z -. %d ",shm->Liofd); XP strcat(execcmd,bottom_label); XP if(protocol_log_packets) XP strcat(execcmd,"-, "); XP if(p_overwrite) XP XP--- 771,778 ----- XP case ECUSZ_Z: XP sprintf(execcmd,"ecusz -Z -. %d ",shm->Liofd); XP strcat(execcmd,bottom_label); XP+ if(zwindw_size) XP+ sprintf(&execcmd[strlen(execcmd)],"-w %d ",zwindw_size); XP if(protocol_log_packets) XP strcat(execcmd,"-, "); XP if(p_overwrite) XP*** /u4/ecurel/help/ecuhelp.src Tue Dec 5 17:06:00 1989 XP--- help/ecuhelp.src Wed May 16 01:35:56 1990 XP*************** XP*** 458,463 XP DTR drops. A shorthand version of this command exists: '.' is XP equivalent to 'exit'. XP #-------------------------------------------------------------------- XP %! XP Usage: ! XP ! XP XP--- 458,473 ----- XP DTR drops. A shorthand version of this command exists: '.' is XP equivalent to 'exit'. XP #-------------------------------------------------------------------- XP+ %xon XP+ Usage: xon [] XP+ where is on input and output flow control XP+ off no flow control XP+ in input flow control XP+ out output flow control XP+ XP+ This command enables or disables xon/xoff flow control. If the XP+ argument is omitted, the current flow control state is displayed. XP+ #-------------------------------------------------------------------- XP %! XP Usage: ! XP ! XP*** /u4/ecurel/pcmd.c Mon May 7 23:33:00 1990 XP--- pcmd.c Wed May 16 01:08:13 1990 XP*************** XP*** 25,30 XP cmd_send(param) XP cmd_set(param) XP cmd_system(param) XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP XP--- 25,31 ----- XP cmd_send(param) XP cmd_set(param) XP cmd_system(param) XP+ cmd_xon(param) XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP*************** XP*** 28,33 XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:04-08-1990-19:15-wht@n4hgf-use new auto_create option on get_?vptr */ XP XP--- 29,35 ----- XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-15-1990-22:32-wht@n4hgf-add xon command */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:04-08-1990-19:15-wht@n4hgf-use new auto_create option on get_?vptr */ XP*************** XP*** 1077,1082 XP /*+------------------------------------------------------------------------- XP cmd_putf(param) XP --------------------------------------------------------------------------*/ XP cmd_putf(param) XP ESD *param; XP { XP XP--- 1079,1085 ----- XP /*+------------------------------------------------------------------------- XP cmd_putf(param) XP --------------------------------------------------------------------------*/ XP+ int XP cmd_putf(param) XP ESD *param; XP { XP*************** XP*** 1082,1087 XP { XP return(eNotImplemented); XP } /* end of cmd_putf */ XP XP /* vi: set tabstop=4 shiftwidth=4: */ XP /* end of pcmd.c */ XP XP--- 1085,1117 ----- XP { XP return(eNotImplemented); XP } /* end of cmd_putf */ XP+ XP+ /*+------------------------------------------------------------------------- XP+ cmd_xon(param) XP+ --------------------------------------------------------------------------*/ XP+ int XP+ cmd_xon(param) XP+ ESD *param; XP+ { XP+ int erc; XP+ char new_xonxoff[8]; XP+ char *xon_status(); XP+ XP+ if(shm->Liofd < 0) XP+ return(eNoLineAttached); XP+ XP+ if(erc = get_alpha_zstr(param,new_xonxoff,sizeof(new_xonxoff))) XP+ return(erc); XP+ XP+ if(set_xon_xoff_by_arg(new_xonxoff)) XP+ return(eBadParameter); XP+ XP+ if(proctrace) XP+ pprintf("xon/xoff flow control set to %s\n",xon_status()); XP+ XP+ return(erc); XP+ XP+ } /* end of cmd_xon */ XP XP /* vi: set tabstop=4 shiftwidth=4: */ XP /* end of pcmd.c */ XP*** /u4/ecurel/poutput.c Mon May 7 23:33:00 1990 XP--- poutput.c Sun May 13 16:12:00 1990 XP*************** XP*** 11,16 XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:03-25-1990-14:11-wht@n4hgf------ x2.70 ------- */ XP XP--- 11,17 ----- XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-13-1990-16:11-wht@n4hgf-add procedure output to rcvr log */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */ XP /*:03-25-1990-14:11-wht@n4hgf------ x2.70 ------- */ XP*************** XP*** 23,28 XP #include "esd.h" XP XP extern int proctrace; XP XP FILE *plog_fp = (FILE *)0; XP ESD *plog_name = (ESD *)0; XP XP--- 24,30 ----- XP #include "esd.h" XP XP extern int proctrace; XP+ extern FILE *rcvr_log_fp; XP XP FILE *plog_fp = (FILE *)0; XP ESD *plog_name = (ESD *)0; XP*************** XP*** 61,66 XP fputc(ch,se); XP if(plog_fp && (ch != CR)) XP fputc(ch,plog_fp); XP } /* end of pputc */ XP XP /*+------------------------------------------------------------------------- XP XP--- 63,70 ----- XP fputc(ch,se); XP if(plog_fp && (ch != CR)) XP fputc(ch,plog_fp); XP+ if(rcvr_log_fp && (ch != CR)) XP+ fputc(ch,rcvr_log_fp); XP } /* end of pputc */ XP XP /*+------------------------------------------------------------------------- XP*************** XP*** 77,82 XP fputc(*str,se); XP if(plog_fp && (*str != CR)) XP fputc(*str,plog_fp); XP str++; XP } XP } /* end of pputs */ XP XP--- 81,88 ----- XP fputc(*str,se); XP if(plog_fp && (*str != CR)) XP fputc(*str,plog_fp); XP+ if(rcvr_log_fp && (*str != CR)) XP+ fputc(*str,rcvr_log_fp); XP str++; XP } XP } /* end of pputs */ XP*** /u4/ecurel/z/ecurz.c Mon May 7 23:29:00 1990 XP--- z/ecurz.c Mon May 14 19:53:17 1990 XP*************** XP*** 1,5 XP /* CHK=0x459E */ XP! char *numeric_revision = "ecurz 2.37"; XP /*+------------------------------------------------------------------------- XP ecurz.c - X/Y/ZMODEM receive program XP Derived from public domain source by Chuck Foresberg, Omen Technologies XP XP--- 1,5 ----- XP /* CHK=0x459E */ XP! char *numeric_revision = "ecurz 2.38"; XP /*+------------------------------------------------------------------------- XP ecurz.c - X/Y/ZMODEM receive program XP Derived from public domain source by Chuck Foresberg, Omen Technologies XP*************** XP*** 58,63 XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-16-1990-20:56-wht@n4hgf-was not displaying filename when "CPM" sender */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */ XP XP--- 58,64 ----- XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-14-1990-19:45-wht@n4hgf-version chg because of zcurses changes */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:04-16-1990-20:56-wht@n4hgf-was not displaying filename when "CPM" sender */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */ XP*** /u4/ecurel/z/ecusz.c Mon May 7 23:29:00 1990 XP--- z/ecusz.c Mon May 14 20:12:35 1990 XP*************** XP*** 1,5 XP /* CHK=0x89BB */ XP! char *numeric_revision = "ecusz 2.37"; XP #define BUFFERED_WRITE XP /*+------------------------------------------------------------------------- XP ecusz.c - X/Y/ZMODEM send program XP XP--- 1,5 ----- XP /* CHK=0x89BB */ XP! char *numeric_revision = "ecusz 2.38"; XP #define BUFFERED_WRITE XP /*+------------------------------------------------------------------------- XP ecusz.c - X/Y/ZMODEM send program XP*************** XP*** 67,72 XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */ XP /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */ XP XP--- 67,74 ----- XP XP --------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-14-1990-20:10-wht@n4hgf-log_packets i/o occurred before log open */ XP+ /*:05-14-1990-16:17-wht@n4hgf-show open window size */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */ XP /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */ XP*************** XP*** 104,109 XP extern unsigned short crctab[]; /* wht */ XP extern unsigned long total_data_chars_xfered; /* zcurses.c */ XP extern int errno; XP extern int Rxtimeout; /* Tenths of seconds to wait for something */ XP extern char Rxhdr[4]; /* Received header */ XP extern char Txhdr[4]; /* Transmitted header */ XP XP--- 106,112 ----- XP extern unsigned short crctab[]; /* wht */ XP extern unsigned long total_data_chars_xfered; /* zcurses.c */ XP extern int errno; XP+ extern int show_window; XP extern int Rxtimeout; /* Tenths of seconds to wait for something */ XP extern char Rxhdr[4]; /* Received header */ XP extern char Txhdr[4]; /* Transmitted header */ XP*************** XP*** 515,520 XP blklen=1024; XP break; XP case 'Z': XP required_type = 1; XP break; XP XP XP--- 518,524 ----- XP blklen=1024; XP break; XP case 'Z': XP+ show_window = 1; XP required_type = 1; XP break; XP XP*************** XP*** 647,654 XP XP set_file_list(npats,paths); XP sprintf(s128,"%s",numeric_revision); XP- report_init(s128); XP- mode(1); XP XP if(log_packets) XP { XP XP--- 651,656 ----- XP XP set_file_list(npats,paths); XP sprintf(s128,"%s",numeric_revision); XP XP if(log_packets) XP { XP*************** XP*** 674,679 XP } XP } XP XP if(signal(SIGINT,cancel_transaction) == SIG_IGN) XP signal(SIGINT,SIG_IGN); XP else XP XP--- 676,684 ----- XP } XP } XP XP+ report_init(s128); XP+ mode(1); XP+ XP if(signal(SIGINT,cancel_transaction) == SIG_IGN) XP signal(SIGINT,SIG_IGN); XP else XP*************** XP*** 694,700 XP write(iofd,"rz\r",3); XP else /* wht -- why not? */ XP write(iofd,"rb\r",3); /* wht */ XP! nap(1500L); XP report_str("beginning transfer",-1); XP if(!Nozmodem) XP { XP XP--- 699,705 ----- XP write(iofd,"rz\r",3); XP else /* wht -- why not? */ XP write(iofd,"rb\r",3); /* wht */ XP! nap(2000L); XP report_str("beginning transfer",-1); XP if(!Nozmodem) XP { XP*** /u4/ecurel/z/zcurses.c Mon May 7 23:29:00 1990 XP--- z/zcurses.c Tue May 15 07:51:51 1990 XP*************** XP*** 11,19 XP 04| _55____________________________________________________ | transaction XP 05| _55____________________________________________________ | last rx/tx hdr XP 06| Comm I/O: rx _8______ tx _8______ bytes | XP! 07| Baud rate: _5___ BINARY blklen: _____ comm mode: CBREAK | XP! 08| Time: started: __:__:__ this file: __:__:__ | XP! 09| __:__:__ elapsed: __:__:__ __:__:__ | XP 10| Errors: this file: _3_ total: _4__ files skipped: _3_ | XP 11| _55____________________________________________________ | err str XP 12| _55____________________________________________________ | comment str XP XP--- 11,19 ----- XP 04| _55____________________________________________________ | transaction XP 05| _55____________________________________________________ | last rx/tx hdr XP 06| Comm I/O: rx _8______ tx _8______ bytes | XP! 07| Baud rate: _5___ BINARY blklen: _____ comm mode: RAW-g | XP! 08| Time: started: __:__:__ this file: __:__:__ window: | XP! 09| __:__:__ elapsed: __:__:__ __:__:__ ________ | XP 10| Errors: this file: _3_ total: _4__ files skipped: _3_ | XP 11| _55____________________________________________________ | err str XP 12| _55____________________________________________________ | comment str XP*************** XP*** 52,57 XP report_txblklen(blklen) XP report_txpos(txpos) XP report_uninit(sig) XP report_xfer_mode(str) XP XP ------------------------------------------------------------------------*/ XP XP--- 52,58 ----- XP report_txblklen(blklen) XP report_txpos(txpos) XP report_uninit(sig) XP+ report_window() XP report_xfer_mode(str) XP XP ------------------------------------------------------------------------*/ XP*************** XP*** 56,61 XP XP ------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation */ XP /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */ XP XP--- 57,64 ----- XP XP ------------------------------------------------------------------------*/ XP /*+:EDITS:*/ XP+ /*:05-15-1990-07:51-wht@n4hgf-transfer efficiency + fix stat report problems */ XP+ /*:05-14-1990-16:17-wht@n4hgf-add window unacked display */ XP /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */ XP /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation */ XP /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */ XP*************** XP*** 95,100 XP extern int npats; XP extern long rxpos; XP extern int log_packets; XP XP WINDOW *win; XP int (*original_sigint_handler)(); XP XP--- 98,105 ----- XP extern int npats; XP extern long rxpos; XP extern int log_packets; XP+ extern long Txpos; XP+ extern long Rxpos; XP XP WINDOW *win; XP int (*original_sigint_handler)(); XP*************** XP*** 103,112 XP int curses_installed = 0; /* curses not yet active */ XP int this_file_errors; XP int total_errors; XP! long current_seconds; XP! long start_seconds; XP! long this_file_start_seconds; XP! long elapsed_seconds; XP unsigned long total_data_chars_xfered = 0L; XP char s256[256]; XP XP XP--- 108,118 ----- XP int curses_installed = 0; /* curses not yet active */ XP int this_file_errors; XP int total_errors; XP! int show_window = 0; XP! long current_seconds = 0; XP! long start_seconds = 0; XP! long this_file_start_seconds = 0; XP! long elapsed_seconds = 0; XP unsigned long total_data_chars_xfered = 0L; XP unsigned int zcurses_baud_rate = 0; XP char s256[256]; XP*************** XP*** 108,113 XP long this_file_start_seconds; XP long elapsed_seconds; XP unsigned long total_data_chars_xfered = 0L; XP char s256[256]; XP XP char *win_template[] = XP XP--- 114,120 ----- XP long this_file_start_seconds = 0; XP long elapsed_seconds = 0; XP unsigned long total_data_chars_xfered = 0L; XP+ unsigned int zcurses_baud_rate = 0; XP char s256[256]; XP XP char *win_template[] = XP*************** XP*** 122,129 XP " tx: ______________________ rx: ______________________ ", /* 5 */ XP " Comm I/O: rx ________ tx ________ bytes ", /* 6 */ XP " Baud rate: _____ ______ blklen: _____ comm mode: ______ ", /* 7 */ XP! " Time: started: __:__:__ this file: __:__:__ ", /* 8 */ XP! " __:__:__ elapsed: __:__:__ __:__:__ ", /* 9 */ XP " Errors: this file: ___ total: ____ files skipped: ___ ", /* 10 */ XP " ", /* 11 */ XP " ", /* 12 */ XP XP--- 129,136 ----- XP " tx: ______________________ rx: ______________________ ", /* 5 */ XP " Comm I/O: rx ________ tx ________ bytes ", /* 6 */ XP " Baud rate: _____ ______ blklen: _____ comm mode: ______ ", /* 7 */ XP! " Time: started: __:__:__ this file: __:__:__ ", /* 8 */ XP! " __:__:__ elapsed: __:__:__ __:__:__ ", /* 9 */ XP " Errors: this file: ___ total: ____ files skipped: ___ ", /* 10 */ XP " ", /* 11 */ XP " ", /* 12 */ XP*************** XP*** 303,309 XP XP /*+------------------------------------------------------------------------- XP report_top_line(topstr) XP! top line: row 1 col 17 length 40 XP --------------------------------------------------------------------------*/ XP void XP report_top_line(topstr) XP XP--- 310,316 ----- XP XP /*+------------------------------------------------------------------------- XP report_top_line(topstr) XP! top line: row 1 col 17 length 42 XP --------------------------------------------------------------------------*/ XP void XP report_top_line(topstr) XP*************** XP*** 393,399 XP report_uninit(sig) XP int sig; /* if -1, called by normal code, else kill() value */ XP { XP! float total = (float)total_data_chars_xfered; XP XP if(curses_installed) XP { XP XP--- 400,407 ----- XP report_uninit(sig) XP int sig; /* if -1, called by normal code, else kill() value */ XP { XP! float rate = 0.0; XP! float eff = 0.0; XP XP if(curses_installed) XP { XP*************** XP*** 397,403 XP XP if(curses_installed) XP { XP! if((total_data_chars_xfered != 0L) && (elapsed_seconds != 0L)) XP { XP elapsed_seconds = current_seconds - start_seconds; XP sprintf(s128,"Data xfer rate ~= %6.0f chars/sec", XP XP--- 405,412 ----- XP XP if(curses_installed) XP { XP! elapsed_seconds = current_seconds - start_seconds; XP! if(elapsed_seconds) XP { XP rate = (float)total_data_chars_xfered / (float)elapsed_seconds; XP if(zcurses_baud_rate) XP*************** XP*** 399,407 XP { XP if((total_data_chars_xfered != 0L) && (elapsed_seconds != 0L)) XP { XP! elapsed_seconds = current_seconds - start_seconds; XP! sprintf(s128,"Data xfer rate ~= %6.0f chars/sec", XP! total / (float)elapsed_seconds); XP if(log_packets) XP { XP write(log_packets,"info: ",6); XP XP--- 408,421 ----- XP elapsed_seconds = current_seconds - start_seconds; XP if(elapsed_seconds) XP { XP! rate = (float)total_data_chars_xfered / (float)elapsed_seconds; XP! if(zcurses_baud_rate) XP! eff = rate / ((float)zcurses_baud_rate / 10.0); XP! } XP! if(rate > 0.01) XP! { XP! sprintf(s128,"Transfer rate ~= %.0f ch/sec (%.2f%%)", XP! rate,(eff > 0.005) ? eff : 0.0); XP if(log_packets) XP { XP write(log_packets,"info: ",6); XP*************** XP*** 424,429 XP XP /*+------------------------------------------------------------------------- XP report_init(title) XP --------------------------------------------------------------------------*/ XP void XP report_init(title) XP XP--- 438,448 ----- XP XP /*+------------------------------------------------------------------------- XP report_init(title) XP+ "top line": row 1 col 11 len 21 XP+ file quan: row 2 col 15 len 3 XP+ row 2 col 12 len 7 clear "of ###" XP+ start time: row 8 col 21 len 8 XP+ "window:" row 8 col 50 len 7 XP --------------------------------------------------------------------------*/ XP void XP report_init(title) XP*************** XP*** 503,509 XP ecu_log_event(s128); XP #endif XP XP! clear_area(win,1,11,47); XP report_error_count(); XP clear_area(win,8,26,8); /* starting time */ XP waddstr(win,get_tod(1,(char *)0)); XP XP--- 522,528 ----- XP ecu_log_event(s128); XP #endif XP XP! clear_area(win,1,11,21); XP report_error_count(); XP clear_area(win,8,21,8); /* starting time */ XP waddstr(win,get_tod(1,(char *)0)); XP*************** XP*** 505,511 XP XP clear_area(win,1,11,47); XP report_error_count(); XP! clear_area(win,8,26,8); /* starting time */ XP waddstr(win,get_tod(1,(char *)0)); XP start_seconds = time((long *)0); XP current_seconds = start_seconds; XP XP--- 524,530 ----- XP XP clear_area(win,1,11,21); XP report_error_count(); XP! clear_area(win,8,21,8); /* starting time */ XP waddstr(win,get_tod(1,(char *)0)); XP start_seconds = time((long *)0); XP current_seconds = start_seconds; XP*************** XP*** 510,515 XP start_seconds = time((long *)0); XP current_seconds = start_seconds; XP XP wrefresh(win); XP XP } /* end of report_init */ XP XP--- 529,542 ----- XP start_seconds = time((long *)0); XP current_seconds = start_seconds; XP XP+ if(show_window) XP+ { XP+ wmove(win,8,50); XP+ waddstr(win,"window:"); XP+ wmove(win,9,50); XP+ waddstr(win,"+0"); XP+ } XP+ XP wrefresh(win); XP XP } /* end of report_init */ XP*************** XP*** 545,550 XP } /* end of report_tx_ind */ XP XP /*+------------------------------------------------------------------------- XP report_rx_tx_count() XP XP This procedure may be counted upon to perform wrefresh(win) XP XP--- 572,605 ----- XP } /* end of report_tx_ind */ XP XP /*+------------------------------------------------------------------------- XP+ report_window() - if enable, show open widow size XP+ --------------------------------------------------------------------------*/ XP+ void XP+ report_window() XP+ { XP+ if(show_window) XP+ { XP+ long ltmp; XP+ wmove(win,9,50); XP+ if((ltmp = (Txpos - Rxpos)) > 999999L) XP+ waddstr(win,">+999999"); XP+ else if(ltmp < -999999L) XP+ ; XP+ else XP+ { XP+ sprintf(s128,"%+-8ld",ltmp); XP+ waddstr(win,s128); XP+ if(log_packets) XP+ { XP+ write(log_packets,"window: ",8); XP+ write(log_packets,s128,strlen(s128)); XP+ write(log_packets,"\n",1); XP+ } XP+ } XP+ } XP+ } /* end of report_window */ XP+ XP+ /*+------------------------------------------------------------------------- XP report_rx_tx_count() XP XP This procedure may be counted upon to perform wrefresh(win) XP*************** XP*** 549,559 XP XP This procedure may be counted upon to perform wrefresh(win) XP XP! rx char count: row 6 col 16 length 8 unsigned long XP! tx char count: row 6 col 29 length 8 unsigned long XP! session elapsed time row 9 col 26 length 8 XP! session elapsed time row 9 col 47 length 8 XP! current tod row 9 col 3 length 8 XP --------------------------------------------------------------------------*/ XP report_rx_tx_count() XP { XP XP--- 604,615 ----- XP XP This procedure may be counted upon to perform wrefresh(win) XP XP! rx char count: row 6 col 16 len 8 unsigned long XP! tx char count: row 6 col 29 len 8 unsigned long XP! session elapsed time: row 9 col 21 len 8 XP! this file elapsed time: row 9 col 41 len 8 XP! current tod: row 9 col 3 len 8 XP! window: row 9 col 50 len 8 XP --------------------------------------------------------------------------*/ XP report_rx_tx_count() XP { XP*************** XP*** 570,576 XP waddstr(win,s128); XP XP /* now time of day */ XP! clear_area(win,9,3,8); XP cptr = get_tod(1,(char *)0); XP waddstr(win,cptr); XP current_seconds = time((long *)0); XP XP--- 626,632 ----- XP waddstr(win,s128); XP XP /* now time of day */ XP! wmove(win,9,3); XP cptr = get_tod(1,(char *)0); XP waddstr(win,cptr); XP current_seconds = time((long *)0); XP*************** XP*** 576,582 XP current_seconds = time((long *)0); XP elapsed_seconds = current_seconds - start_seconds; XP cptr = get_elapsed_time(elapsed_seconds); XP! clear_area(win,9,26,8); XP waddstr(win,cptr); XP elapsed_seconds = current_seconds - this_file_start_seconds; XP cptr = get_elapsed_time(elapsed_seconds); XP XP--- 632,638 ----- XP current_seconds = time((long *)0); XP elapsed_seconds = current_seconds - start_seconds; XP cptr = get_elapsed_time(elapsed_seconds); XP! wmove(win,9,21); XP waddstr(win,cptr); XP if(this_file_start_seconds) XP elapsed_seconds = current_seconds - this_file_start_seconds; XP*************** XP*** 578,584 XP cptr = get_elapsed_time(elapsed_seconds); XP clear_area(win,9,26,8); XP waddstr(win,cptr); XP! elapsed_seconds = current_seconds - this_file_start_seconds; XP cptr = get_elapsed_time(elapsed_seconds); XP clear_area(win,9,47,8); XP waddstr(win,cptr); XP XP--- 634,643 ----- XP cptr = get_elapsed_time(elapsed_seconds); XP wmove(win,9,21); XP waddstr(win,cptr); XP! if(this_file_start_seconds) XP! elapsed_seconds = current_seconds - this_file_start_seconds; XP! else XP! elapsed_seconds = 0; XP cptr = get_elapsed_time(elapsed_seconds); XP wmove(win,9,41); XP waddstr(win,cptr); XP*************** XP*** 580,586 XP waddstr(win,cptr); XP elapsed_seconds = current_seconds - this_file_start_seconds; XP cptr = get_elapsed_time(elapsed_seconds); XP! clear_area(win,9,47,8); XP waddstr(win,cptr); XP wrefresh(win); /* calling procs expect this to occur always */ XP XP XP--- 639,645 ----- XP else XP elapsed_seconds = 0; XP cptr = get_elapsed_time(elapsed_seconds); XP! wmove(win,9,41); XP waddstr(win,cptr); XP XP report_window(); XP*************** XP*** 582,587 XP cptr = get_elapsed_time(elapsed_seconds); XP clear_area(win,9,47,8); XP waddstr(win,cptr); XP wrefresh(win); /* calling procs expect this to occur always */ XP XP } /* end of report_rx_tx_count */ XP XP--- 641,649 ----- XP cptr = get_elapsed_time(elapsed_seconds); XP wmove(win,9,41); XP waddstr(win,cptr); XP+ XP+ report_window(); XP+ XP wrefresh(win); /* calling procs expect this to occur always */ XP XP } /* end of report_rx_tx_count */ XP*************** XP*** 809,814 XP ++total_errors; XP report_error_count(); XP } XP XP } /* end of report_last_rxhdr */ XP XP XP--- 871,877 ----- XP ++total_errors; XP report_error_count(); XP } XP+ report_window(); XP XP } /* end of report_last_rxhdr */ XP XP*************** XP*** 882,888 XP /*+------------------------------------------------------------------------- XP report_file_open_tod() -- time of start of this file XP XP! this file open time: row 8 col 47 length 8 XP --------------------------------------------------------------------------*/ XP void XP report_file_open_tod() XP XP--- 945,951 ----- XP /*+------------------------------------------------------------------------- XP report_file_open_tod() -- time of start of this file XP XP! this file open time: row 8 col 41 length 8 XP --------------------------------------------------------------------------*/ XP void XP report_file_open_tod() XP*************** XP*** 887,893 XP void XP report_file_open_tod() XP { XP! clear_area(win,8,47,8); XP this_file_start_seconds = time((long *)0); XP waddstr(win,get_tod(1,(char *)0)); XP wrefresh(win); XP XP--- 950,956 ----- XP void XP report_file_open_tod() XP { XP! clear_area(win,8,41,8); XP this_file_start_seconds = time((long *)0); XP waddstr(win,get_tod(1,(char *)0)); XP wrefresh(win); XP*************** XP*** 978,987 XP /*+------------------------------------------------------------------------- XP report_file_rcv_started(filename,length,last_mod_time,file_mode) XP XP! filename: row 2 col 7 len 50 XP! length: row 3 col 36 len 8 if not xmodem XP! mode: row 3 col 46 len 10 XP! time of start of this file: row 4 col 47 length 8 hh:mm:ss XP --------------------------------------------------------------------------*/ XP report_file_rcv_started(filename,length,last_mod_time,file_mode) XP char *filename; XP XP--- 1041,1049 ----- XP /*+------------------------------------------------------------------------- XP report_file_rcv_started(filename,length,last_mod_time,file_mode) XP XP! filenumber: row 2 col 8 len 3 XP! row 2 col 12 len 7 clear "of ###" XP! filename: row 2 col 20 len 38 XP --------------------------------------------------------------------------*/ XP report_file_rcv_started(filename,length,last_mod_time,file_mode) XP char *filename; XP*************** XP*** 1043,1048 XP --------------------------------------------------------------------------*/ XP void report_file_close() XP { XP report_str("End of file",0); XP wrefresh(win); XP XP XP--- 1105,1118 ----- XP --------------------------------------------------------------------------*/ XP void report_file_close() XP { XP+ if(show_window) XP+ { XP+ clear_area(win,9,50,8); XP+ waddstr(win,"+0"); XP+ Txpos = 0; XP+ Rxpos = 0; XP+ } XP+ XP report_str("End of file",0); XP wrefresh(win); XP this_file_start_seconds = 0; XP*************** XP*** 1045,1050 XP { XP report_str("End of file",0); XP wrefresh(win); XP XP } /* end of report_file_close */ XP XP XP--- 1115,1121 ----- XP XP report_str("End of file",0); XP wrefresh(win); XP+ this_file_start_seconds = 0; XP XP } /* end of report_file_close */ XP XP*************** XP*** 1058,1063 XP { XP char tstr8[8]; XP XP clear_area(win,7,14,5); XP if(baud_rate == 0) XP waddstr(win,"?"); XP XP--- 1129,1135 ----- XP { XP char tstr8[8]; XP XP+ zcurses_baud_rate = baud_rate; XP clear_area(win,7,14,5); XP if(baud_rate == 0) XP waddstr(win,"?"); XDIFF_EOF Xexit 0 X#end of ECU280.P1.02 SHAR_EOF $TOUCH -am 0516021190 ECU280.P1.02 && chmod 0755 ECU280.P1.02 || echo "restore of ECU280.P1.02 failed" set `wc -c ECU280.P1.02`;Wc_c=$1 if test "$Wc_c" != "37028"; then echo original size 37028, current size $Wc_c fi # ============= patchlevel.h ============== echo "x - extracting patchlevel.h (Text)" sed 's/^X//' << 'SHAR_EOF' > patchlevel.h && X/* CHK=0x224E */ X#define PATCHLEVEL 1 SHAR_EOF $TOUCH -am 0510165190 patchlevel.h && chmod 0644 patchlevel.h || echo "restore of patchlevel.h failed" set `wc -c patchlevel.h`;Wc_c=$1 if test "$Wc_c" != "38"; then echo original size 38, current size $Wc_c fi if touch 2>&1 | fgrep '[-amc]' > /dev/null then TOUCH=touch else TOUCH=true fi # ============= help/helpgen.fls ============== if test ! -d 'help'; then echo "x - creating directory help" mkdir 'help' fi echo "x - extracting help/helpgen.fls (Text)" sed 's/^X//' << 'SHAR_EOF' > help/helpgen.fls && Xhelpgen.c Xutil.c SHAR_EOF $TOUCH -am 0508021090 help/helpgen.fls && chmod 0644 help/helpgen.fls || echo "restore of help/helpgen.fls failed" set `wc -c help/helpgen.fls`;Wc_c=$1 if test "$Wc_c" != "17"; then echo original size 17, current size $Wc_c fi exit 0