home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / misc / volume12 / ecu2.80 / patch01contd < prev    next >
Encoding:
Text File  |  1990-05-16  |  39.1 KB  |  1,342 lines
  1. Newsgroups: comp.sources.misc
  2. subject: v12i102: ECU patch 1 part 02/02
  3. from: wht%n4hgf@gatech.edu (Warren Tucker)
  4. Sender: allbery@uunet.UU.NET (Brandon S. Allbery - comp.sources.misc)
  5.  
  6. Posting-number: Volume 12, Issue 102
  7. Submitted-by: wht%n4hgf@gatech.edu (Warren Tucker)
  8. Archive-name: ecu2.80/patch01contd
  9.  
  10. #!/bin/sh
  11. # This is part 02 of ecu2.80/patch01.
  12. if touch 2>&1 | fgrep '[-amc]' > /dev/null
  13.  then TOUCH=touch
  14.  else TOUCH=true
  15. fi
  16. # ============= ECU280.P1.02 ==============
  17. echo "x - extracting ECU280.P1.02 (Text)"
  18. sed 's/^X//' << 'SHAR_EOF' > ECU280.P1.02 &&
  19. X:
  20. X#-------------------------------------------------------
  21. X# ECU280.P1.02
  22. X# created by gendiff x1.03 on 16 May 1990 06:10 UTC
  23. X#-------------------------------------------------------
  24. Xsed -e 's/^P//' << DIFF_EOF | patch -p
  25. XP*** /u4/ecurel/ecusighdl.c    Mon May  7 23:33:00 1990
  26. XP--- ecusighdl.c    Sun May 13 16:22:29 1990
  27. XP***************
  28. XP*** 25,30
  29. XP  
  30. XP  ------------------------------------------------------------------------*/
  31. XP  /*+:EDITS:*/
  32. XP  /*:05-07-1990-21:23-wht@n4hgf---- 2.80 --- */
  33. XP  /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */
  34. XP  /*:04-10-1990-17:34-wht@n4hgf-provisions for ecu xmtr logging when rcvr dead */
  35. XP
  36. XP--- 25,32 -----
  37. XP  
  38. XP  ------------------------------------------------------------------------*/
  39. XP  /*+:EDITS:*/
  40. XP+ /*:05-13-1990-16:21-wht@n4hgf-log -s got stuck, rcvr_log_append now set to 1 */
  41. XP+ /*:05-11-1990-14:07-wht@n4hgf-make XMTR&RCVR ignore SIGQUIT - kermit uses ^\ */
  42. XP  /*:05-07-1990-21:23-wht@n4hgf---- 2.80 --- */
  43. XP  /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */
  44. XP  /*:04-10-1990-17:34-wht@n4hgf-provisions for ecu xmtr logging when rcvr dead */
  45. XP***************
  46. XP*** 51,56
  47. XP  extern int rcvr_log;
  48. XP  extern FILE *rcvr_log_fp;
  49. XP  extern char rcvr_log_file[];    /* if rcvr_log!= 0,log filename */
  50. XP  
  51. XP  int interrupt = 0;            /* interrupt indicator */
  52. XP  int proc_interrupt = 0;        /* procedure interrupt indicator */
  53. XP
  54. XP--- 53,59 -----
  55. XP  extern int rcvr_log;
  56. XP  extern FILE *rcvr_log_fp;
  57. XP  extern char rcvr_log_file[];    /* if rcvr_log!= 0,log filename */
  58. XP+ extern int rcvr_log_append;
  59. XP  
  60. XP  int interrupt = 0;            /* interrupt indicator */
  61. XP  int proc_interrupt = 0;        /* procedure interrupt indicator */
  62. XP***************
  63. XP*** 114,119
  64. XP          sprintf(s40,"DEBUG rcvr pid %d",rcvr_pid);
  65. XP          ecu_log_event(s40);        /* rcvr */
  66. XP  #endif
  67. XP          xmtr_signals();
  68. XP          return(rcvr_pid);
  69. XP      }
  70. XP
  71. XP--- 117,124 -----
  72. XP          sprintf(s40,"DEBUG rcvr pid %d",rcvr_pid);
  73. XP          ecu_log_event(s40);        /* rcvr */
  74. XP  #endif
  75. XP+         if(rcvr_log)
  76. XP+             rcvr_log_append = 1;    /* until next %log -s */
  77. XP          xmtr_signals();
  78. XP          return(rcvr_pid);
  79. XP      }
  80. XP***************
  81. XP*** 417,423
  82. XP  xmtr_signals()
  83. XP  {
  84. XP      signal(SIGHUP,xmtr_SIGHUP_handler);
  85. XP!     signal(SIGQUIT,SIG_DFL);
  86. XP      signal(SIGINT,xmtr_SIGINT_handler);
  87. XP      signal(SIGTERM,xmtr_SIGTERM_handler);
  88. XP      signal(SIGCLD,xmtr_SIGCLD_handler);
  89. XP
  90. XP--- 422,428 -----
  91. XP  xmtr_signals()
  92. XP  {
  93. XP      signal(SIGHUP,xmtr_SIGHUP_handler);
  94. XP!     signal(SIGQUIT,SIG_IGN);
  95. XP      signal(SIGINT,xmtr_SIGINT_handler);
  96. XP      signal(SIGTERM,xmtr_SIGTERM_handler);
  97. XP      signal(SIGCLD,xmtr_SIGCLD_handler);
  98. XP***************
  99. XP*** 431,437
  100. XP  rcvr_signals()
  101. XP  {
  102. XP      signal(SIGHUP,rcvr_SIGHUP_handler);
  103. XP!     signal(SIGQUIT,SIG_DFL);
  104. XP      signal(SIGTERM,rcvr_SIGTERM_handler);
  105. XP      signal(SIGINT,rcvr_SIGINT_handler);
  106. XP      signal(SIGUSR1,rcvr_SIGUSR1_handler);
  107. XP
  108. XP--- 436,442 -----
  109. XP  rcvr_signals()
  110. XP  {
  111. XP      signal(SIGHUP,rcvr_SIGHUP_handler);
  112. XP!     signal(SIGQUIT,SIG_IGN);
  113. XP      signal(SIGTERM,rcvr_SIGTERM_handler);
  114. XP      signal(SIGINT,rcvr_SIGINT_handler);
  115. XP      signal(SIGUSR1,rcvr_SIGUSR1_handler);
  116. XP*** /u4/ecurel/ecuxfer.c    Mon May  7 23:33:00 1990
  117. XP--- ecuxfer.c    Mon May 14 13:50:48 1990
  118. XP***************
  119. XP*** 36,41
  120. XP  
  121. XP  --------------------------------------------------------------------------*/
  122. XP  /*+:EDITS:*/
  123. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  124. XP  /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */
  125. XP  /*:03-27-1990-15:18-wht@n4hgf-overhaul for/wait/SIGCLD handling */
  126. XP
  127. XP--- 36,42 -----
  128. XP  
  129. XP  --------------------------------------------------------------------------*/
  130. XP  /*+:EDITS:*/
  131. XP+ /*:05-14-1990-13:28-wht@n4hgf-add window size choice to sz */
  132. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  133. XP  /*:04-19-1990-03:07-wht@n4hgf-GCC run found unused vars -- rm them */
  134. XP  /*:03-27-1990-15:18-wht@n4hgf-overhaul for/wait/SIGCLD handling */
  135. XP***************
  136. XP*** 96,101
  137. XP  #define SNDW_XFRNEW_LX        3
  138. XP  #define SNDW_XFRNEW_X        30
  139. XP  
  140. XP  extern char curr_dir[];        /* current working directory */
  141. XP  extern int protocol_log_packets;
  142. XP  extern int last_child_wait_status;
  143. XP
  144. XP--- 97,107 -----
  145. XP  #define SNDW_XFRNEW_LX        3
  146. XP  #define SNDW_XFRNEW_X        30
  147. XP  
  148. XP+ #define SNDW_ZWINDW_Y        9
  149. XP+ #define SNDW_ZWINDW_LX        3
  150. XP+ #define SNDW_ZWINDW_X        16
  151. XP+ #define SNDW_ZWINDW_LEN        6
  152. XP+ 
  153. XP  extern char curr_dir[];        /* current working directory */
  154. XP  extern int protocol_log_packets;
  155. XP  extern int last_child_wait_status;
  156. XP***************
  157. XP*** 112,117
  158. XP  char p_overwrite;
  159. XP  char p_xfernew;
  160. XP  char p_filelist[80];
  161. XP  
  162. XP  /*+-------------------------------------------------------------------------
  163. XP      file_xfer_start()
  164. XP
  165. XP--- 118,124 -----
  166. XP  char p_overwrite;
  167. XP  char p_xfernew;
  168. XP  char p_filelist[80];
  169. XP+ int zwindw_size;
  170. XP  
  171. XP  /*+-------------------------------------------------------------------------
  172. XP      file_xfer_start()
  173. XP***************
  174. XP*** 280,285
  175. XP              waddstr(xfrw,"Transfer only newer files:");
  176. XP              wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_LX);
  177. XP              waddstr(xfrw,"Send full pathames:");
  178. XP          case CKERMIT:
  179. XP              wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_LX);
  180. XP              waddstr(xfrw,"Overwrite destination files:");
  181. XP
  182. XP--- 287,294 -----
  183. XP              waddstr(xfrw,"Transfer only newer files:");
  184. XP              wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_LX);
  185. XP              waddstr(xfrw,"Send full pathames:");
  186. XP+             wmove(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_LX);
  187. XP+             waddstr(xfrw,"Window size:");
  188. XP          case CKERMIT:
  189. XP              wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_LX);
  190. XP              waddstr(xfrw,"Overwrite destination files:");
  191. XP***************
  192. XP*** 336,341
  193. XP  void
  194. XP  xfrws_display_allvars()
  195. XP  {
  196. XP      xfrws_display_name();
  197. XP      switch(xfertype)
  198. XP      {
  199. XP
  200. XP--- 345,352 -----
  201. XP  void
  202. XP  xfrws_display_allvars()
  203. XP  {
  204. XP+ char s16[16];
  205. XP+ 
  206. XP      xfrws_display_name();
  207. XP      switch(xfertype)
  208. XP      {
  209. XP***************
  210. XP*** 343,348
  211. XP              xfrws_display_xfernew();
  212. XP              wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_X);
  213. XP              waddch(xfrw,(p_sendfull) ? 'Y' : 'N');
  214. XP          case CKERMIT:
  215. XP              wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_X);
  216. XP              waddch(xfrw,(p_overwrite) ? 'Y' : 'N');
  217. XP
  218. XP--- 354,362 -----
  219. XP              xfrws_display_xfernew();
  220. XP              wmove(xfrw,SNDW_SNDFUL_Y,SNDW_SNDFUL_X);
  221. XP              waddch(xfrw,(p_sendfull) ? 'Y' : 'N');
  222. XP+             wmove(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X);
  223. XP+             sprintf(s16,"%d",zwindw_size);
  224. XP+             waddstr(xfrw,s16);
  225. XP          case CKERMIT:
  226. XP              wmove(xfrw,SNDW_OVERW_Y,SNDW_OVERW_X);
  227. XP              waddch(xfrw,(p_overwrite) ? 'Y' : 'N');
  228. XP***************
  229. XP*** 450,455
  230. XP      p_overwrite = 1;    /* assume overwrite */
  231. XP      p_xfernew = 0;        /* assume send only newer */
  232. XP      p_filelist[0] = 0;    /* no filenames yet */
  233. XP  
  234. XP      switch(to_lower(*(argv[0] + 1)))
  235. XP      {
  236. XP
  237. XP--- 464,470 -----
  238. XP      p_overwrite = 1;    /* assume overwrite */
  239. XP      p_xfernew = 0;        /* assume send only newer */
  240. XP      p_filelist[0] = 0;    /* no filenames yet */
  241. XP+     zwindw_size = 0;    /* assume full streaming sz */
  242. XP  
  243. XP      switch(to_lower(*(argv[0] + 1)))
  244. XP      {
  245. XP***************
  246. XP*** 479,485
  247. XP              xfrw_lines = 9;
  248. XP              break;
  249. XP          case ECUSZ_Z:
  250. XP!             input_state_mod = 5;
  251. XP          case CKERMIT:
  252. XP              if(!input_state_mod)
  253. XP                  input_state_mod = 3;
  254. XP
  255. XP--- 494,500 -----
  256. XP              xfrw_lines = 9;
  257. XP              break;
  258. XP          case ECUSZ_Z:
  259. XP!             input_state_mod = 6;
  260. XP          case CKERMIT:
  261. XP              if(!input_state_mod)
  262. XP                  input_state_mod = 3;
  263. XP***************
  264. XP*** 621,627
  265. XP                  }
  266. XP                  break;
  267. XP  
  268. XP!             case 4:        /* resume interrupted transfer */
  269. XP  
  270. XP                  xfrw_bot_msg(
  271. XP                  "Y: send only if source newer than destination, N send all");
  272. XP
  273. XP--- 636,642 -----
  274. XP                  }
  275. XP                  break;
  276. XP  
  277. XP!             case 4:        /* src newer than dest */
  278. XP  
  279. XP                  xfrw_bot_msg(
  280. XP                  "Y: send only if source newer than destination, N send all");
  281. XP***************
  282. XP*** 641,646
  283. XP                  }
  284. XP                  break;
  285. XP  
  286. XP          }
  287. XP  
  288. XP          switch(delim)
  289. XP
  290. XP--- 656,687 -----
  291. XP                  }
  292. XP                  break;
  293. XP  
  294. XP+             case 5:        /* window size */
  295. XP+ 
  296. XP+                 xfrw_bot_msg(
  297. XP+                 "window size (bytes transferred before ACK) 0 = stream");
  298. XP+                 sprintf(s80,"%d",zwindw_size);
  299. XP+                 itmp = wingets(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X,s80,
  300. XP+                     SNDW_ZWINDW_LEN + 1,&delim,1);
  301. XP+                 if(delim == ESC)
  302. XP+                     break;
  303. XP+                 if(strlen(s80))
  304. XP+                 {
  305. XP+                     if(((itmp = atoi(s80)) < 0) ||
  306. XP+                         ((itmp < 256) || (itmp > 65536)))
  307. XP+                     {
  308. XP+                         ring_bell();
  309. XP+                         xfrw_bot_msg(
  310. XP+                             "window size must be 0 or 256 <= w <= 65536");
  311. XP+                         continue;
  312. XP+                     }
  313. XP+                     zwindw_size = atoi(s80);
  314. XP+                     sprintf(s80,"%d",zwindw_size);
  315. XP+                     clear_area(xfrw,SNDW_ZWINDW_Y,SNDW_ZWINDW_X,
  316. XP+                         SNDW_ZWINDW_LEN);
  317. XP+                     waddstr(xfrw,s80);
  318. XP+                 }
  319. XP+                 break;
  320. XP          }
  321. XP  
  322. XP          switch(delim)
  323. XP***************
  324. XP*** 730,735
  325. XP          case ECUSZ_Z:
  326. XP              sprintf(execcmd,"ecusz -Z -. %d ",shm->Liofd);
  327. XP              strcat(execcmd,bottom_label);
  328. XP              if(protocol_log_packets)
  329. XP                  strcat(execcmd,"-, ");
  330. XP              if(p_overwrite)
  331. XP
  332. XP--- 771,778 -----
  333. XP          case ECUSZ_Z:
  334. XP              sprintf(execcmd,"ecusz -Z -. %d ",shm->Liofd);
  335. XP              strcat(execcmd,bottom_label);
  336. XP+             if(zwindw_size)
  337. XP+                 sprintf(&execcmd[strlen(execcmd)],"-w %d ",zwindw_size);
  338. XP              if(protocol_log_packets)
  339. XP                  strcat(execcmd,"-, ");
  340. XP              if(p_overwrite)
  341. XP*** /u4/ecurel/help/ecuhelp.src    Tue Dec  5 17:06:00 1989
  342. XP--- help/ecuhelp.src    Wed May 16 01:35:56 1990
  343. XP***************
  344. XP*** 458,463
  345. XP  DTR drops.  A shorthand version of this command exists: '.' is
  346. XP  equivalent to 'exit'.
  347. XP  #--------------------------------------------------------------------
  348. XP  %!
  349. XP  Usage: !
  350. XP         !<command>
  351. XP
  352. XP--- 458,473 -----
  353. XP  DTR drops.  A shorthand version of this command exists: '.' is
  354. XP  equivalent to 'exit'.
  355. XP  #--------------------------------------------------------------------
  356. XP+ %xon
  357. XP+ Usage: xon [<arg>]
  358. XP+ where <arg> is on    input and output flow control
  359. XP+                off   no flow control
  360. XP+                in    input flow control
  361. XP+                out   output flow control
  362. XP+ 
  363. XP+ This command enables or disables xon/xoff flow control.  If the
  364. XP+ argument is omitted, the current flow control state is displayed.
  365. XP+ #--------------------------------------------------------------------
  366. XP  %!
  367. XP  Usage: !
  368. XP         !<command>
  369. XP*** /u4/ecurel/pcmd.c    Mon May  7 23:33:00 1990
  370. XP--- pcmd.c    Wed May 16 01:08:13 1990
  371. XP***************
  372. XP*** 25,30
  373. XP      cmd_send(param)
  374. XP      cmd_set(param)
  375. XP      cmd_system(param)
  376. XP  
  377. XP  --------------------------------------------------------------------------*/
  378. XP  /*+:EDITS:*/
  379. XP
  380. XP--- 25,31 -----
  381. XP      cmd_send(param)
  382. XP      cmd_set(param)
  383. XP      cmd_system(param)
  384. XP+     cmd_xon(param)
  385. XP  
  386. XP  --------------------------------------------------------------------------*/
  387. XP  /*+:EDITS:*/
  388. XP***************
  389. XP*** 28,33
  390. XP  
  391. XP  --------------------------------------------------------------------------*/
  392. XP  /*+:EDITS:*/
  393. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  394. XP  /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */
  395. XP  /*:04-08-1990-19:15-wht@n4hgf-use new auto_create option on get_?vptr */
  396. XP
  397. XP--- 29,35 -----
  398. XP  
  399. XP  --------------------------------------------------------------------------*/
  400. XP  /*+:EDITS:*/
  401. XP+ /*:05-15-1990-22:32-wht@n4hgf-add xon command */
  402. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  403. XP  /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */
  404. XP  /*:04-08-1990-19:15-wht@n4hgf-use new auto_create option on get_?vptr */
  405. XP***************
  406. XP*** 1077,1082
  407. XP  /*+-------------------------------------------------------------------------
  408. XP      cmd_putf(param)
  409. XP  --------------------------------------------------------------------------*/
  410. XP  cmd_putf(param)
  411. XP  ESD *param;
  412. XP  {
  413. XP
  414. XP--- 1079,1085 -----
  415. XP  /*+-------------------------------------------------------------------------
  416. XP      cmd_putf(param)
  417. XP  --------------------------------------------------------------------------*/
  418. XP+ int
  419. XP  cmd_putf(param)
  420. XP  ESD *param;
  421. XP  {
  422. XP***************
  423. XP*** 1082,1087
  424. XP  {
  425. XP      return(eNotImplemented);
  426. XP  }    /* end of cmd_putf */
  427. XP  
  428. XP  /* vi: set tabstop=4 shiftwidth=4: */
  429. XP  /* end of pcmd.c */
  430. XP
  431. XP--- 1085,1117 -----
  432. XP  {
  433. XP      return(eNotImplemented);
  434. XP  }    /* end of cmd_putf */
  435. XP+ 
  436. XP+ /*+-------------------------------------------------------------------------
  437. XP+     cmd_xon(param)
  438. XP+ --------------------------------------------------------------------------*/
  439. XP+ int
  440. XP+ cmd_xon(param)
  441. XP+ ESD *param;
  442. XP+ {
  443. XP+ int erc;
  444. XP+ char new_xonxoff[8];
  445. XP+ char *xon_status();
  446. XP+ 
  447. XP+     if(shm->Liofd < 0)
  448. XP+         return(eNoLineAttached);
  449. XP+ 
  450. XP+     if(erc = get_alpha_zstr(param,new_xonxoff,sizeof(new_xonxoff)))
  451. XP+         return(erc);
  452. XP+ 
  453. XP+     if(set_xon_xoff_by_arg(new_xonxoff))
  454. XP+         return(eBadParameter);
  455. XP+ 
  456. XP+     if(proctrace)
  457. XP+         pprintf("xon/xoff flow control set to %s\n",xon_status());
  458. XP+ 
  459. XP+     return(erc);
  460. XP+ 
  461. XP+ }    /* end of cmd_xon */
  462. XP  
  463. XP  /* vi: set tabstop=4 shiftwidth=4: */
  464. XP  /* end of pcmd.c */
  465. XP*** /u4/ecurel/poutput.c    Mon May  7 23:33:00 1990
  466. XP--- poutput.c    Sun May 13 16:12:00 1990
  467. XP***************
  468. XP*** 11,16
  469. XP  
  470. XP  --------------------------------------------------------------------------*/
  471. XP  /*+:EDITS:*/
  472. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  473. XP  /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */
  474. XP  /*:03-25-1990-14:11-wht@n4hgf------ x2.70 ------- */
  475. XP
  476. XP--- 11,17 -----
  477. XP  
  478. XP  --------------------------------------------------------------------------*/
  479. XP  /*+:EDITS:*/
  480. XP+ /*:05-13-1990-16:11-wht@n4hgf-add procedure output to rcvr log */
  481. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  482. XP  /*:04-19-1990-03:08-wht@n4hgf-GCC run found unused vars -- rm them */
  483. XP  /*:03-25-1990-14:11-wht@n4hgf------ x2.70 ------- */
  484. XP***************
  485. XP*** 23,28
  486. XP  #include "esd.h"
  487. XP  
  488. XP  extern int proctrace;
  489. XP  
  490. XP  FILE *plog_fp = (FILE *)0;
  491. XP  ESD *plog_name = (ESD *)0;
  492. XP
  493. XP--- 24,30 -----
  494. XP  #include "esd.h"
  495. XP  
  496. XP  extern int proctrace;
  497. XP+ extern FILE *rcvr_log_fp;
  498. XP  
  499. XP  FILE *plog_fp = (FILE *)0;
  500. XP  ESD *plog_name = (ESD *)0;
  501. XP***************
  502. XP*** 61,66
  503. XP      fputc(ch,se);
  504. XP      if(plog_fp && (ch != CR))
  505. XP          fputc(ch,plog_fp);
  506. XP  }    /* end of pputc */
  507. XP  
  508. XP  /*+-------------------------------------------------------------------------
  509. XP
  510. XP--- 63,70 -----
  511. XP      fputc(ch,se);
  512. XP      if(plog_fp && (ch != CR))
  513. XP          fputc(ch,plog_fp);
  514. XP+     if(rcvr_log_fp && (ch != CR))
  515. XP+         fputc(ch,rcvr_log_fp);
  516. XP  }    /* end of pputc */
  517. XP  
  518. XP  /*+-------------------------------------------------------------------------
  519. XP***************
  520. XP*** 77,82
  521. XP          fputc(*str,se);
  522. XP          if(plog_fp && (*str != CR))
  523. XP              fputc(*str,plog_fp);
  524. XP          str++;
  525. XP      }
  526. XP  }    /* end of pputs */
  527. XP
  528. XP--- 81,88 -----
  529. XP          fputc(*str,se);
  530. XP          if(plog_fp && (*str != CR))
  531. XP              fputc(*str,plog_fp);
  532. XP+         if(rcvr_log_fp && (*str != CR))
  533. XP+             fputc(*str,rcvr_log_fp);
  534. XP          str++;
  535. XP      }
  536. XP  }    /* end of pputs */
  537. XP*** /u4/ecurel/z/ecurz.c    Mon May  7 23:29:00 1990
  538. XP--- z/ecurz.c    Mon May 14 19:53:17 1990
  539. XP***************
  540. XP*** 1,5
  541. XP  /* CHK=0x459E */
  542. XP! char *numeric_revision = "ecurz 2.37";
  543. XP  /*+-------------------------------------------------------------------------
  544. XP      ecurz.c - X/Y/ZMODEM receive program
  545. XP    Derived from public domain source by Chuck Foresberg, Omen Technologies
  546. XP
  547. XP--- 1,5 -----
  548. XP  /* CHK=0x459E */
  549. XP! char *numeric_revision = "ecurz 2.38";
  550. XP  /*+-------------------------------------------------------------------------
  551. XP      ecurz.c - X/Y/ZMODEM receive program
  552. XP    Derived from public domain source by Chuck Foresberg, Omen Technologies
  553. XP***************
  554. XP*** 58,63
  555. XP  
  556. XP  --------------------------------------------------------------------------*/
  557. XP  /*+:EDITS:*/
  558. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  559. XP  /*:04-16-1990-20:56-wht@n4hgf-was not displaying filename when "CPM" sender */
  560. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */
  561. XP
  562. XP--- 58,64 -----
  563. XP  
  564. XP  --------------------------------------------------------------------------*/
  565. XP  /*+:EDITS:*/
  566. XP+ /*:05-14-1990-19:45-wht@n4hgf-version chg because of zcurses changes */
  567. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  568. XP  /*:04-16-1990-20:56-wht@n4hgf-was not displaying filename when "CPM" sender */
  569. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */
  570. XP*** /u4/ecurel/z/ecusz.c    Mon May  7 23:29:00 1990
  571. XP--- z/ecusz.c    Mon May 14 20:12:35 1990
  572. XP***************
  573. XP*** 1,5
  574. XP  /* CHK=0x89BB */
  575. XP! char *numeric_revision = "ecusz 2.37";
  576. XP  #define BUFFERED_WRITE
  577. XP  /*+-------------------------------------------------------------------------
  578. XP      ecusz.c - X/Y/ZMODEM send program
  579. XP
  580. XP--- 1,5 -----
  581. XP  /* CHK=0x89BB */
  582. XP! char *numeric_revision = "ecusz 2.38";
  583. XP  #define BUFFERED_WRITE
  584. XP  /*+-------------------------------------------------------------------------
  585. XP      ecusz.c - X/Y/ZMODEM send program
  586. XP***************
  587. XP*** 67,72
  588. XP  
  589. XP  --------------------------------------------------------------------------*/
  590. XP  /*+:EDITS:*/
  591. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  592. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */
  593. XP  /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */
  594. XP
  595. XP--- 67,74 -----
  596. XP  
  597. XP  --------------------------------------------------------------------------*/
  598. XP  /*+:EDITS:*/
  599. XP+ /*:05-14-1990-20:10-wht@n4hgf-log_packets i/o occurred before log open */
  600. XP+ /*:05-14-1990-16:17-wht@n4hgf-show open window size */
  601. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  602. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation (update version) */
  603. XP  /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */
  604. XP***************
  605. XP*** 104,109
  606. XP  extern unsigned short crctab[];    /* wht */
  607. XP  extern unsigned long total_data_chars_xfered; /* zcurses.c */
  608. XP  extern int errno;
  609. XP  extern int Rxtimeout;    /* Tenths of seconds to wait for something */
  610. XP  extern char Rxhdr[4];    /* Received header */
  611. XP  extern char Txhdr[4];    /* Transmitted header */
  612. XP
  613. XP--- 106,112 -----
  614. XP  extern unsigned short crctab[];    /* wht */
  615. XP  extern unsigned long total_data_chars_xfered; /* zcurses.c */
  616. XP  extern int errno;
  617. XP+ extern int show_window;
  618. XP  extern int Rxtimeout;    /* Tenths of seconds to wait for something */
  619. XP  extern char Rxhdr[4];    /* Received header */
  620. XP  extern char Txhdr[4];    /* Transmitted header */
  621. XP***************
  622. XP*** 515,520
  623. XP                  blklen=1024;
  624. XP                  break;
  625. XP              case 'Z':
  626. XP                  required_type = 1;
  627. XP                  break;
  628. XP  
  629. XP
  630. XP--- 518,524 -----
  631. XP                  blklen=1024;
  632. XP                  break;
  633. XP              case 'Z':
  634. XP+                 show_window = 1;
  635. XP                  required_type = 1;
  636. XP                  break;
  637. XP  
  638. XP***************
  639. XP*** 647,654
  640. XP  
  641. XP      set_file_list(npats,paths);
  642. XP      sprintf(s128,"%s",numeric_revision);
  643. XP-     report_init(s128);
  644. XP-     mode(1);
  645. XP  
  646. XP      if(log_packets)
  647. XP      {
  648. XP
  649. XP--- 651,656 -----
  650. XP  
  651. XP      set_file_list(npats,paths);
  652. XP      sprintf(s128,"%s",numeric_revision);
  653. XP  
  654. XP      if(log_packets)
  655. XP      {
  656. XP***************
  657. XP*** 674,679
  658. XP          }
  659. XP      }
  660. XP  
  661. XP      if(signal(SIGINT,cancel_transaction) == SIG_IGN)
  662. XP          signal(SIGINT,SIG_IGN);
  663. XP      else
  664. XP
  665. XP--- 676,684 -----
  666. XP          }
  667. XP      }
  668. XP  
  669. XP+     report_init(s128);
  670. XP+     mode(1);
  671. XP+ 
  672. XP      if(signal(SIGINT,cancel_transaction) == SIG_IGN)
  673. XP          signal(SIGINT,SIG_IGN);
  674. XP      else
  675. XP***************
  676. XP*** 694,700
  677. XP              write(iofd,"rz\r",3);
  678. XP          else    /* wht -- why not? */
  679. XP              write(iofd,"rb\r",3);        /* wht */
  680. XP!         nap(1500L);
  681. XP          report_str("beginning transfer",-1);
  682. XP          if(!Nozmodem)
  683. XP          {
  684. XP
  685. XP--- 699,705 -----
  686. XP              write(iofd,"rz\r",3);
  687. XP          else    /* wht -- why not? */
  688. XP              write(iofd,"rb\r",3);        /* wht */
  689. XP!         nap(2000L);
  690. XP          report_str("beginning transfer",-1);
  691. XP          if(!Nozmodem)
  692. XP          {
  693. XP*** /u4/ecurel/z/zcurses.c    Mon May  7 23:29:00 1990
  694. XP--- z/zcurses.c    Tue May 15 07:51:51 1990
  695. XP***************
  696. XP*** 11,19
  697. XP  04|  _55____________________________________________________ | transaction
  698. XP  05|  _55____________________________________________________ | last rx/tx hdr
  699. XP  06|  Comm I/O: rx _8______  tx _8______ bytes                |
  700. XP! 07|  Baud rate: _5___ BINARY blklen: _____ comm mode: CBREAK |
  701. XP! 08|  Time:         started: __:__:__  this file: __:__:__    |
  702. XP! 09|  __:__:__      elapsed: __:__:__             __:__:__    |
  703. XP  10|  Errors: this file: _3_ total: _4__ files skipped: _3_   |
  704. XP  11|  _55____________________________________________________ |  err str
  705. XP  12|  _55____________________________________________________ |  comment str
  706. XP
  707. XP--- 11,19 -----
  708. XP  04|  _55____________________________________________________ | transaction
  709. XP  05|  _55____________________________________________________ | last rx/tx hdr
  710. XP  06|  Comm I/O: rx _8______  tx _8______ bytes                |
  711. XP! 07|  Baud rate: _5___ BINARY blklen: _____ comm mode: RAW-g  |
  712. XP! 08|  Time:    started: __:__:__ this file: __:__:__ window:  |
  713. XP! 09|  __:__:__ elapsed: __:__:__            __:__:__ ________ |
  714. XP  10|  Errors: this file: _3_ total: _4__ files skipped: _3_   |
  715. XP  11|  _55____________________________________________________ |  err str
  716. XP  12|  _55____________________________________________________ |  comment str
  717. XP***************
  718. XP*** 52,57
  719. XP      report_txblklen(blklen)
  720. XP      report_txpos(txpos)
  721. XP      report_uninit(sig)
  722. XP      report_xfer_mode(str)
  723. XP  
  724. XP  ------------------------------------------------------------------------*/
  725. XP
  726. XP--- 52,58 -----
  727. XP      report_txblklen(blklen)
  728. XP      report_txpos(txpos)
  729. XP      report_uninit(sig)
  730. XP+     report_window()
  731. XP      report_xfer_mode(str)
  732. XP  
  733. XP  ------------------------------------------------------------------------*/
  734. XP***************
  735. XP*** 56,61
  736. XP  
  737. XP  ------------------------------------------------------------------------*/
  738. XP  /*+:EDITS:*/
  739. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  740. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation */
  741. XP  /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */
  742. XP
  743. XP--- 57,64 -----
  744. XP  
  745. XP  ------------------------------------------------------------------------*/
  746. XP  /*+:EDITS:*/
  747. XP+ /*:05-15-1990-07:51-wht@n4hgf-transfer efficiency + fix stat report problems */
  748. XP+ /*:05-14-1990-16:17-wht@n4hgf-add window unacked display */
  749. XP  /*:05-07-1990-21:24-wht@n4hgf---- 2.80 --- */
  750. XP  /*:03-29-1990-16:49-wht@n4hgf-fix xfer rate calculation */
  751. XP  /*:03-25-1990-14:12-wht@n4hgf------- ecu x2.70 -------- */
  752. XP***************
  753. XP*** 95,100
  754. XP  extern int npats;
  755. XP  extern long rxpos;
  756. XP  extern int log_packets;
  757. XP  
  758. XP  WINDOW    *win;
  759. XP  int (*original_sigint_handler)();
  760. XP
  761. XP--- 98,105 -----
  762. XP  extern int npats;
  763. XP  extern long rxpos;
  764. XP  extern int log_packets;
  765. XP+ extern long Txpos;
  766. XP+ extern long Rxpos;
  767. XP  
  768. XP  WINDOW    *win;
  769. XP  int (*original_sigint_handler)();
  770. XP***************
  771. XP*** 103,112
  772. XP  int curses_installed = 0;        /* curses not yet active */
  773. XP  int this_file_errors;
  774. XP  int total_errors;
  775. XP! long current_seconds;
  776. XP! long start_seconds;
  777. XP! long this_file_start_seconds;
  778. XP! long elapsed_seconds;
  779. XP  unsigned long total_data_chars_xfered = 0L;
  780. XP  char s256[256];
  781. XP  
  782. XP
  783. XP--- 108,118 -----
  784. XP  int curses_installed = 0;        /* curses not yet active */
  785. XP  int this_file_errors;
  786. XP  int total_errors;
  787. XP! int show_window = 0;
  788. XP! long current_seconds = 0;
  789. XP! long start_seconds = 0;
  790. XP! long this_file_start_seconds = 0;
  791. XP! long elapsed_seconds = 0;
  792. XP  unsigned long total_data_chars_xfered = 0L;
  793. XP  unsigned int zcurses_baud_rate = 0;
  794. XP  char s256[256];
  795. XP***************
  796. XP*** 108,113
  797. XP  long this_file_start_seconds;
  798. XP  long elapsed_seconds;
  799. XP  unsigned long total_data_chars_xfered = 0L;
  800. XP  char s256[256];
  801. XP  
  802. XP  char *win_template[] =
  803. XP
  804. XP--- 114,120 -----
  805. XP  long this_file_start_seconds = 0;
  806. XP  long elapsed_seconds = 0;
  807. XP  unsigned long total_data_chars_xfered = 0L;
  808. XP+ unsigned int zcurses_baud_rate = 0;
  809. XP  char s256[256];
  810. XP  
  811. XP  char *win_template[] =
  812. XP***************
  813. XP*** 122,129
  814. XP    "  tx: ______________________  rx: ______________________  ",    /* 5 */
  815. XP    "  Comm I/O: rx ________  tx ________ bytes                ",    /* 6 */
  816. XP    "  Baud rate: _____ ______ blklen: _____ comm mode: ______ ",    /* 7 */
  817. XP!   "  Time:         started: __:__:__  this file: __:__:__    ", /* 8 */
  818. XP!   "  __:__:__      elapsed: __:__:__             __:__:__    ", /* 9 */
  819. XP    "  Errors: this file: ___ total: ____ files skipped: ___   ", /* 10 */
  820. XP    "                                                          ",    /* 11 */
  821. XP    "                                                          ",    /* 12 */
  822. XP
  823. XP--- 129,136 -----
  824. XP    "  tx: ______________________  rx: ______________________  ",    /* 5 */
  825. XP    "  Comm I/O: rx ________  tx ________ bytes                ",    /* 6 */
  826. XP    "  Baud rate: _____ ______ blklen: _____ comm mode: ______ ",    /* 7 */
  827. XP!   "  Time:    started: __:__:__ this file: __:__:__          ", /* 8 */
  828. XP!   "  __:__:__ elapsed: __:__:__            __:__:__          ", /* 9 */
  829. XP    "  Errors: this file: ___ total: ____ files skipped: ___   ", /* 10 */
  830. XP    "                                                          ",    /* 11 */
  831. XP    "                                                          ",    /* 12 */
  832. XP***************
  833. XP*** 303,309
  834. XP  
  835. XP  /*+-------------------------------------------------------------------------
  836. XP      report_top_line(topstr)
  837. XP!    top line: row 1 col 17 length 40
  838. XP  --------------------------------------------------------------------------*/
  839. XP  void
  840. XP  report_top_line(topstr)
  841. XP
  842. XP--- 310,316 -----
  843. XP  
  844. XP  /*+-------------------------------------------------------------------------
  845. XP      report_top_line(topstr)
  846. XP!    top line: row 1 col 17 length 42
  847. XP  --------------------------------------------------------------------------*/
  848. XP  void
  849. XP  report_top_line(topstr)
  850. XP***************
  851. XP*** 393,399
  852. XP  report_uninit(sig)
  853. XP  int sig;        /* if -1, called by normal code, else kill() value */
  854. XP  {
  855. XP!     float    total = (float)total_data_chars_xfered;
  856. XP  
  857. XP      if(curses_installed)
  858. XP      {
  859. XP
  860. XP--- 400,407 -----
  861. XP  report_uninit(sig)
  862. XP  int sig;        /* if -1, called by normal code, else kill() value */
  863. XP  {
  864. XP!     float rate = 0.0;
  865. XP!     float eff = 0.0;
  866. XP  
  867. XP      if(curses_installed)
  868. XP      {
  869. XP***************
  870. XP*** 397,403
  871. XP  
  872. XP      if(curses_installed)
  873. XP      {
  874. XP!         if((total_data_chars_xfered != 0L) && (elapsed_seconds != 0L))
  875. XP          {
  876. XP              elapsed_seconds = current_seconds - start_seconds;
  877. XP              sprintf(s128,"Data xfer rate ~= %6.0f chars/sec",
  878. XP
  879. XP--- 405,412 -----
  880. XP  
  881. XP      if(curses_installed)
  882. XP      {
  883. XP!         elapsed_seconds = current_seconds - start_seconds;
  884. XP!         if(elapsed_seconds)
  885. XP          {
  886. XP              rate = (float)total_data_chars_xfered / (float)elapsed_seconds;
  887. XP              if(zcurses_baud_rate)
  888. XP***************
  889. XP*** 399,407
  890. XP      {
  891. XP          if((total_data_chars_xfered != 0L) && (elapsed_seconds != 0L))
  892. XP          {
  893. XP!             elapsed_seconds = current_seconds - start_seconds;
  894. XP!             sprintf(s128,"Data xfer rate ~= %6.0f chars/sec",
  895. XP!                 total / (float)elapsed_seconds);
  896. XP              if(log_packets)
  897. XP              {
  898. XP                  write(log_packets,"info: ",6);
  899. XP
  900. XP--- 408,421 -----
  901. XP          elapsed_seconds = current_seconds - start_seconds;
  902. XP          if(elapsed_seconds)
  903. XP          {
  904. XP!             rate = (float)total_data_chars_xfered / (float)elapsed_seconds;
  905. XP!             if(zcurses_baud_rate)
  906. XP!                 eff  = rate / ((float)zcurses_baud_rate / 10.0);
  907. XP!         }
  908. XP!         if(rate > 0.01)
  909. XP!         {
  910. XP!             sprintf(s128,"Transfer rate ~= %.0f ch/sec (%.2f%%)",
  911. XP!                 rate,(eff > 0.005) ? eff : 0.0);
  912. XP              if(log_packets)
  913. XP              {
  914. XP                  write(log_packets,"info: ",6);
  915. XP***************
  916. XP*** 424,429
  917. XP  
  918. XP  /*+-------------------------------------------------------------------------
  919. XP      report_init(title)
  920. XP  --------------------------------------------------------------------------*/
  921. XP  void
  922. XP  report_init(title)
  923. XP
  924. XP--- 438,448 -----
  925. XP  
  926. XP  /*+-------------------------------------------------------------------------
  927. XP      report_init(title)
  928. XP+   "top line": row 1 col 11 len 21
  929. XP+   file quan:  row 2 col 15 len  3
  930. XP+               row 2 col 12 len  7 clear "of ###"
  931. XP+   start time: row 8 col 21 len  8
  932. XP+   "window:"   row 8 col 50 len  7
  933. XP  --------------------------------------------------------------------------*/
  934. XP  void
  935. XP  report_init(title)
  936. XP***************
  937. XP*** 503,509
  938. XP      ecu_log_event(s128);
  939. XP  #endif
  940. XP  
  941. XP!     clear_area(win,1,11,47);
  942. XP      report_error_count();
  943. XP      clear_area(win,8,26,8);        /* starting time */
  944. XP      waddstr(win,get_tod(1,(char *)0));
  945. XP
  946. XP--- 522,528 -----
  947. XP      ecu_log_event(s128);
  948. XP  #endif
  949. XP  
  950. XP!     clear_area(win,1,11,21);
  951. XP      report_error_count();
  952. XP      clear_area(win,8,21,8);        /* starting time */
  953. XP      waddstr(win,get_tod(1,(char *)0));
  954. XP***************
  955. XP*** 505,511
  956. XP  
  957. XP      clear_area(win,1,11,47);
  958. XP      report_error_count();
  959. XP!     clear_area(win,8,26,8);        /* starting time */
  960. XP      waddstr(win,get_tod(1,(char *)0));
  961. XP      start_seconds = time((long *)0);
  962. XP      current_seconds = start_seconds;
  963. XP
  964. XP--- 524,530 -----
  965. XP  
  966. XP      clear_area(win,1,11,21);
  967. XP      report_error_count();
  968. XP!     clear_area(win,8,21,8);        /* starting time */
  969. XP      waddstr(win,get_tod(1,(char *)0));
  970. XP      start_seconds = time((long *)0);
  971. XP      current_seconds = start_seconds;
  972. XP***************
  973. XP*** 510,515
  974. XP      start_seconds = time((long *)0);
  975. XP      current_seconds = start_seconds;
  976. XP  
  977. XP      wrefresh(win);
  978. XP  
  979. XP  }    /* end of report_init */
  980. XP
  981. XP--- 529,542 -----
  982. XP      start_seconds = time((long *)0);
  983. XP      current_seconds = start_seconds;
  984. XP  
  985. XP+     if(show_window)
  986. XP+     {
  987. XP+         wmove(win,8,50);
  988. XP+         waddstr(win,"window:");
  989. XP+         wmove(win,9,50);
  990. XP+         waddstr(win,"+0");
  991. XP+     }
  992. XP+ 
  993. XP      wrefresh(win);
  994. XP  
  995. XP  }    /* end of report_init */
  996. XP***************
  997. XP*** 545,550
  998. XP  }    /* end of report_tx_ind */
  999. XP  
  1000. XP  /*+-------------------------------------------------------------------------
  1001. XP      report_rx_tx_count()
  1002. XP  
  1003. XP    This procedure may be counted upon to perform wrefresh(win)
  1004. XP
  1005. XP--- 572,605 -----
  1006. XP  }    /* end of report_tx_ind */
  1007. XP  
  1008. XP  /*+-------------------------------------------------------------------------
  1009. XP+     report_window() - if enable, show open widow size
  1010. XP+ --------------------------------------------------------------------------*/
  1011. XP+ void
  1012. XP+ report_window()
  1013. XP+ {
  1014. XP+     if(show_window)
  1015. XP+     {
  1016. XP+     long ltmp;
  1017. XP+         wmove(win,9,50);
  1018. XP+         if((ltmp = (Txpos - Rxpos)) > 999999L)
  1019. XP+             waddstr(win,">+999999");
  1020. XP+         else if(ltmp < -999999L)
  1021. XP+             ;
  1022. XP+         else
  1023. XP+         {
  1024. XP+             sprintf(s128,"%+-8ld",ltmp);
  1025. XP+             waddstr(win,s128);
  1026. XP+             if(log_packets)
  1027. XP+             {
  1028. XP+                 write(log_packets,"window: ",8);
  1029. XP+                 write(log_packets,s128,strlen(s128));
  1030. XP+                 write(log_packets,"\n",1);
  1031. XP+             }
  1032. XP+         }
  1033. XP+     }
  1034. XP+ }    /* end of report_window */
  1035. XP+ 
  1036. XP+ /*+-------------------------------------------------------------------------
  1037. XP      report_rx_tx_count()
  1038. XP  
  1039. XP    This procedure may be counted upon to perform wrefresh(win)
  1040. XP***************
  1041. XP*** 549,559
  1042. XP  
  1043. XP    This procedure may be counted upon to perform wrefresh(win)
  1044. XP  
  1045. XP! rx char count: row 6 col 16 length 8 unsigned long
  1046. XP! tx char count: row 6 col 29 length 8 unsigned long
  1047. XP! session elapsed time row 9 col 26 length 8
  1048. XP! session elapsed time row 9 col 47 length 8
  1049. XP! current tod row 9 col 3 length 8
  1050. XP  --------------------------------------------------------------------------*/
  1051. XP  report_rx_tx_count()
  1052. XP  {
  1053. XP
  1054. XP--- 604,615 -----
  1055. XP  
  1056. XP    This procedure may be counted upon to perform wrefresh(win)
  1057. XP  
  1058. XP!   rx char count:          row 6 col 16 len 8 unsigned long
  1059. XP!   tx char count:          row 6 col 29 len 8 unsigned long
  1060. XP!   session elapsed time:   row 9 col 21 len 8
  1061. XP!   this file elapsed time: row 9 col 41 len 8
  1062. XP!   current tod:            row 9 col  3 len 8
  1063. XP!   window:                 row 9 col 50 len 8
  1064. XP  --------------------------------------------------------------------------*/
  1065. XP  report_rx_tx_count()
  1066. XP  {
  1067. XP***************
  1068. XP*** 570,576
  1069. XP      waddstr(win,s128);
  1070. XP  
  1071. XP      /* now time of day */
  1072. XP!     clear_area(win,9,3,8);
  1073. XP      cptr = get_tod(1,(char *)0);
  1074. XP      waddstr(win,cptr);
  1075. XP      current_seconds = time((long *)0);
  1076. XP
  1077. XP--- 626,632 -----
  1078. XP      waddstr(win,s128);
  1079. XP  
  1080. XP      /* now time of day */
  1081. XP!     wmove(win,9,3);
  1082. XP      cptr = get_tod(1,(char *)0);
  1083. XP      waddstr(win,cptr);
  1084. XP      current_seconds = time((long *)0);
  1085. XP***************
  1086. XP*** 576,582
  1087. XP      current_seconds = time((long *)0);
  1088. XP      elapsed_seconds = current_seconds - start_seconds;
  1089. XP      cptr = get_elapsed_time(elapsed_seconds);
  1090. XP!     clear_area(win,9,26,8);
  1091. XP      waddstr(win,cptr);
  1092. XP      elapsed_seconds = current_seconds - this_file_start_seconds;
  1093. XP      cptr = get_elapsed_time(elapsed_seconds);
  1094. XP
  1095. XP--- 632,638 -----
  1096. XP      current_seconds = time((long *)0);
  1097. XP      elapsed_seconds = current_seconds - start_seconds;
  1098. XP      cptr = get_elapsed_time(elapsed_seconds);
  1099. XP!     wmove(win,9,21);
  1100. XP      waddstr(win,cptr);
  1101. XP      if(this_file_start_seconds)
  1102. XP          elapsed_seconds = current_seconds - this_file_start_seconds;
  1103. XP***************
  1104. XP*** 578,584
  1105. XP      cptr = get_elapsed_time(elapsed_seconds);
  1106. XP      clear_area(win,9,26,8);
  1107. XP      waddstr(win,cptr);
  1108. XP!     elapsed_seconds = current_seconds - this_file_start_seconds;
  1109. XP      cptr = get_elapsed_time(elapsed_seconds);
  1110. XP      clear_area(win,9,47,8);
  1111. XP      waddstr(win,cptr);
  1112. XP
  1113. XP--- 634,643 -----
  1114. XP      cptr = get_elapsed_time(elapsed_seconds);
  1115. XP      wmove(win,9,21);
  1116. XP      waddstr(win,cptr);
  1117. XP!     if(this_file_start_seconds)
  1118. XP!         elapsed_seconds = current_seconds - this_file_start_seconds;
  1119. XP!     else
  1120. XP!         elapsed_seconds = 0;
  1121. XP      cptr = get_elapsed_time(elapsed_seconds);
  1122. XP      wmove(win,9,41);
  1123. XP      waddstr(win,cptr);
  1124. XP***************
  1125. XP*** 580,586
  1126. XP      waddstr(win,cptr);
  1127. XP      elapsed_seconds = current_seconds - this_file_start_seconds;
  1128. XP      cptr = get_elapsed_time(elapsed_seconds);
  1129. XP!     clear_area(win,9,47,8);
  1130. XP      waddstr(win,cptr);
  1131. XP      wrefresh(win);        /* calling procs expect this to occur always */
  1132. XP  
  1133. XP
  1134. XP--- 639,645 -----
  1135. XP      else
  1136. XP          elapsed_seconds = 0;
  1137. XP      cptr = get_elapsed_time(elapsed_seconds);
  1138. XP!     wmove(win,9,41);
  1139. XP      waddstr(win,cptr);
  1140. XP  
  1141. XP      report_window();
  1142. XP***************
  1143. XP*** 582,587
  1144. XP      cptr = get_elapsed_time(elapsed_seconds);
  1145. XP      clear_area(win,9,47,8);
  1146. XP      waddstr(win,cptr);
  1147. XP      wrefresh(win);        /* calling procs expect this to occur always */
  1148. XP  
  1149. XP  }    /* end of report_rx_tx_count */
  1150. XP
  1151. XP--- 641,649 -----
  1152. XP      cptr = get_elapsed_time(elapsed_seconds);
  1153. XP      wmove(win,9,41);
  1154. XP      waddstr(win,cptr);
  1155. XP+ 
  1156. XP+     report_window();
  1157. XP+ 
  1158. XP      wrefresh(win);        /* calling procs expect this to occur always */
  1159. XP  
  1160. XP  }    /* end of report_rx_tx_count */
  1161. XP***************
  1162. XP*** 809,814
  1163. XP          ++total_errors;
  1164. XP          report_error_count();
  1165. XP      }
  1166. XP  
  1167. XP  }    /* end of report_last_rxhdr */
  1168. XP  
  1169. XP
  1170. XP--- 871,877 -----
  1171. XP          ++total_errors;
  1172. XP          report_error_count();
  1173. XP      }
  1174. XP+     report_window();
  1175. XP  
  1176. XP  }    /* end of report_last_rxhdr */
  1177. XP  
  1178. XP***************
  1179. XP*** 882,888
  1180. XP  /*+-------------------------------------------------------------------------
  1181. XP      report_file_open_tod() -- time of start of this file
  1182. XP  
  1183. XP!   this file open time: row 8 col 47 length 8
  1184. XP  --------------------------------------------------------------------------*/
  1185. XP  void
  1186. XP  report_file_open_tod()
  1187. XP
  1188. XP--- 945,951 -----
  1189. XP  /*+-------------------------------------------------------------------------
  1190. XP      report_file_open_tod() -- time of start of this file
  1191. XP  
  1192. XP!   this file open time: row 8 col 41 length 8
  1193. XP  --------------------------------------------------------------------------*/
  1194. XP  void
  1195. XP  report_file_open_tod()
  1196. XP***************
  1197. XP*** 887,893
  1198. XP  void
  1199. XP  report_file_open_tod()
  1200. XP  {
  1201. XP!     clear_area(win,8,47,8);
  1202. XP      this_file_start_seconds = time((long *)0);
  1203. XP      waddstr(win,get_tod(1,(char *)0));
  1204. XP      wrefresh(win);
  1205. XP
  1206. XP--- 950,956 -----
  1207. XP  void
  1208. XP  report_file_open_tod()
  1209. XP  {
  1210. XP!     clear_area(win,8,41,8);
  1211. XP      this_file_start_seconds = time((long *)0);
  1212. XP      waddstr(win,get_tod(1,(char *)0));
  1213. XP      wrefresh(win);
  1214. XP***************
  1215. XP*** 978,987
  1216. XP  /*+-------------------------------------------------------------------------
  1217. XP      report_file_rcv_started(filename,length,last_mod_time,file_mode)
  1218. XP  
  1219. XP!   filename: row 2 col 7 len 50
  1220. XP!   length:   row 3 col 36 len  8 if not xmodem
  1221. XP!   mode:     row 3 col 46 len 10
  1222. XP!   time of start of this file: row 4 col 47 length 8 hh:mm:ss
  1223. XP  --------------------------------------------------------------------------*/
  1224. XP  report_file_rcv_started(filename,length,last_mod_time,file_mode)
  1225. XP  char *filename;
  1226. XP
  1227. XP--- 1041,1049 -----
  1228. XP  /*+-------------------------------------------------------------------------
  1229. XP      report_file_rcv_started(filename,length,last_mod_time,file_mode)
  1230. XP  
  1231. XP!   filenumber: row 2 col  8 len  3
  1232. XP!               row 2 col 12 len  7 clear "of ###"
  1233. XP!   filename:   row 2 col 20 len 38
  1234. XP  --------------------------------------------------------------------------*/
  1235. XP  report_file_rcv_started(filename,length,last_mod_time,file_mode)
  1236. XP  char *filename;
  1237. XP***************
  1238. XP*** 1043,1048
  1239. XP  --------------------------------------------------------------------------*/
  1240. XP  void report_file_close()
  1241. XP  {
  1242. XP      report_str("End of file",0);
  1243. XP      wrefresh(win);
  1244. XP  
  1245. XP
  1246. XP--- 1105,1118 -----
  1247. XP  --------------------------------------------------------------------------*/
  1248. XP  void report_file_close()
  1249. XP  {
  1250. XP+     if(show_window)
  1251. XP+     {
  1252. XP+         clear_area(win,9,50,8);
  1253. XP+         waddstr(win,"+0");
  1254. XP+         Txpos = 0;
  1255. XP+         Rxpos = 0;
  1256. XP+     }
  1257. XP+ 
  1258. XP      report_str("End of file",0);
  1259. XP      wrefresh(win);
  1260. XP      this_file_start_seconds = 0;
  1261. XP***************
  1262. XP*** 1045,1050
  1263. XP  {
  1264. XP      report_str("End of file",0);
  1265. XP      wrefresh(win);
  1266. XP  
  1267. XP  }    /* end of report_file_close */
  1268. XP  
  1269. XP
  1270. XP--- 1115,1121 -----
  1271. XP  
  1272. XP      report_str("End of file",0);
  1273. XP      wrefresh(win);
  1274. XP+     this_file_start_seconds = 0;
  1275. XP  
  1276. XP  }    /* end of report_file_close */
  1277. XP  
  1278. XP***************
  1279. XP*** 1058,1063
  1280. XP  {
  1281. XP      char tstr8[8];
  1282. XP  
  1283. XP      clear_area(win,7,14,5);
  1284. XP      if(baud_rate == 0)
  1285. XP          waddstr(win,"?");
  1286. XP
  1287. XP--- 1129,1135 -----
  1288. XP  {
  1289. XP      char tstr8[8];
  1290. XP  
  1291. XP+     zcurses_baud_rate = baud_rate;
  1292. XP      clear_area(win,7,14,5);
  1293. XP      if(baud_rate == 0)
  1294. XP          waddstr(win,"?");
  1295. XDIFF_EOF
  1296. Xexit 0
  1297. X#end of ECU280.P1.02
  1298. SHAR_EOF
  1299. $TOUCH -am 0516021190 ECU280.P1.02 &&
  1300. chmod 0755 ECU280.P1.02 ||
  1301. echo "restore of ECU280.P1.02 failed"
  1302. set `wc -c ECU280.P1.02`;Wc_c=$1
  1303. if test "$Wc_c" != "37028"; then
  1304.     echo original size 37028, current size $Wc_c
  1305. fi
  1306. # ============= patchlevel.h ==============
  1307. echo "x - extracting patchlevel.h (Text)"
  1308. sed 's/^X//' << 'SHAR_EOF' > patchlevel.h &&
  1309. X/* CHK=0x224E */
  1310. X#define PATCHLEVEL 1
  1311. SHAR_EOF
  1312. $TOUCH -am 0510165190 patchlevel.h &&
  1313. chmod 0644 patchlevel.h ||
  1314. echo "restore of patchlevel.h failed"
  1315. set `wc -c patchlevel.h`;Wc_c=$1
  1316. if test "$Wc_c" != "38"; then
  1317.     echo original size 38, current size $Wc_c
  1318. fi
  1319. if touch 2>&1 | fgrep '[-amc]' > /dev/null
  1320.  then TOUCH=touch
  1321.  else TOUCH=true
  1322. fi
  1323. # ============= help/helpgen.fls ==============
  1324. if test ! -d 'help'; then
  1325.     echo "x - creating directory help"
  1326.     mkdir 'help'
  1327. fi
  1328. echo "x - extracting help/helpgen.fls (Text)"
  1329. sed 's/^X//' << 'SHAR_EOF' > help/helpgen.fls &&
  1330. Xhelpgen.c
  1331. Xutil.c
  1332. SHAR_EOF
  1333. $TOUCH -am 0508021090 help/helpgen.fls &&
  1334. chmod 0644 help/helpgen.fls ||
  1335. echo "restore of help/helpgen.fls failed"
  1336. set `wc -c help/helpgen.fls`;Wc_c=$1
  1337. if test "$Wc_c" != "17"; then
  1338.     echo original size 17, current size $Wc_c
  1339. fi
  1340. exit 0
  1341.  
  1342.