home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / misc / volume22 / ecu / patch03b < prev    next >
Encoding:
Text File  |  1991-08-28  |  50.2 KB  |  1,997 lines
  1. Newsgroups: comp.sources.misc
  2. From: Warren Tucker <wht@n4hgf.GA.US>
  3. Subject:  v22i071:  ecu - ECU async comm package rev 3.10, Patch03b/3
  4. Message-ID: <1991Aug28.030146.19474@sparky.IMD.Sterling.COM>
  5. X-Md4-Signature: fefc41d7daa787a147df25c830d3d561
  6. Date: Wed, 28 Aug 1991 03:01:46 GMT
  7. Approved: kent@sparky.imd.sterling.com
  8.  
  9. Submitted-by: Warren Tucker <wht@n4hgf.GA.US>
  10. Posting-number: Volume 22, Issue 71
  11. Archive-name: ecu/patch03b
  12. Environment: SCO, XENIX, ISC, SUNOS4.1, SYSVR4
  13. Patch-To: ecu: Volume 21, Issue 53-89
  14.  
  15. #!/bin/sh
  16. # this is ecu/patch3b (ECU 3.10 patch 3 part 2)
  17. # do not concatenate these parts, unpack them in order with /bin/sh
  18. # file PATCH3.01 continued
  19. #
  20. if test ! -r _shar_seq_.tmp; then
  21.     echo 'Please unpack part 1 first!'
  22.     exit 1
  23. fi
  24. (read Scheck
  25.  if test "$Scheck" != 2; then
  26.     echo Please unpack part "$Scheck" next!
  27.     exit 1
  28.  else
  29.     exit 0
  30.  fi
  31. ) < _shar_seq_.tmp || exit 1
  32. if test ! -f _shar_wnt_.tmp; then
  33.     echo 'x - still skipping PATCH3.01'
  34. else
  35. echo 'x - continuing file PATCH3.01'
  36. sed 's/^X//' << 'SHAR_EOF' >> 'PATCH3.01' &&
  37. --- 35,45 ----
  38. X  # include <local/fas.h>
  39. X  #endif
  40. X  
  41. + #ifdef SVR4
  42. + # include <sys/termiox.h>
  43. + extern int hx_flag;
  44. + #endif
  45. + 
  46. X  extern KDE keyset_table[];
  47. X  extern char *makedate;
  48. X  extern char curr_dir[CURR_DIRSIZ];
  49. ***************
  50. *** 511,525 ****
  51. X          break;
  52. X  
  53. X          case CTrtscts:
  54. ! #if defined(RTSFLOW)    /* only SCO has this */
  55. X          if(narg > 1)
  56. X          {
  57. X              lRTSCTS_control(yes_or_no(arg[1]));
  58. X          }
  59. X          ff(se,"  RTS %s CTS %s\r\n",
  60. X              (Ltermio.c_cflag & RTSFLOW) ? "on" : "off",
  61. X              (Ltermio.c_cflag & CTSFLOW) ? "on" : "off");
  62. X  #else
  63. X          ff(se,"  command not available\r\n");
  64. X  #endif
  65. X          break;
  66. --- 518,544 ----
  67. X          break;
  68. X  
  69. X          case CTrtscts:
  70. ! #if defined(RTSFLOW) || defined(SVR4) || defined(sun)
  71. X          if(narg > 1)
  72. X          {
  73. X              lRTSCTS_control(yes_or_no(arg[1]));
  74. X          }
  75. X          ff(se,"  RTS %s CTS %s\r\n",
  76. + #ifdef SVR4
  77. +             (hx_flag & RTSXOFF) ? "on" : "off",
  78. +             (hx_flag & CTSXON) ? "on" : "off");
  79. + #else
  80. + #if defined(RTSFLOW) /* SCO */
  81. X              (Ltermio.c_cflag & RTSFLOW) ? "on" : "off",
  82. X              (Ltermio.c_cflag & CTSFLOW) ? "on" : "off");
  83. X  #else
  84. + #if defined(sun)
  85. +             "N/A",
  86. +             (Ltermio.c_cflag & CRTSCTS) ? "on" : "off");
  87. + #endif /* sun */
  88. + #endif /* RTSFLOW */
  89. + #endif /* SVR4 */
  90. + #else /* no RTS/CTS flow manipulation known to exist */
  91. X          ff(se,"  command not available\r\n");
  92. X  #endif
  93. X          break;
  94. ***************
  95. *** 661,677 ****
  96. X  */
  97. X  
  98. X          case CTmemstat:
  99. ! #if defined(WHT) && defined(MALLOC_3X)
  100. X      {
  101. X          struct mallinfo minfo;
  102. X          extern char *startbrk;
  103. X          char *sbrk();
  104. - #define DEBUG_SURETY
  105. - #ifdef DEBUG_SURETY    /* malloc has been called a zillion times, but ... */
  106. -         char *cptr = malloc(100);
  107. -         free(cptr);
  108. -         pprintf("we got %08lx\n",cptr);
  109. - #endif
  110. X          minfo = mallinfo();
  111. X          pputs("\n"); /* all this casting for 16- vs 32- bit ints */
  112. X          pprintf("%10lu total space in arena\n",(ulong)minfo.arena);
  113. --- 680,690 ----
  114. X  */
  115. X  
  116. X          case CTmemstat:
  117. ! #if defined(MALLOC_3X)
  118. X      {
  119. X          struct mallinfo minfo;
  120. X          extern char *startbrk;
  121. X          char *sbrk();
  122. X          minfo = mallinfo();
  123. X          pputs("\n"); /* all this casting for 16- vs 32- bit ints */
  124. X          pprintf("%10lu total space in arena\n",(ulong)minfo.arena);
  125. ***************
  126. *** 691,697 ****
  127. X      }
  128. X  #else
  129. X          ff(se,"  not available\r\n");
  130. ! #endif /* WHT */
  131. X          break;
  132. X  
  133. X          case 0:
  134. --- 704,715 ----
  135. X      }
  136. X  #else
  137. X          ff(se,"  not available\r\n");
  138. ! #endif
  139. !         break;
  140. ! 
  141. !         case CTkbdtest:
  142. !         ff(se,"\r\n");
  143. !         kbd_test();
  144. X          break;
  145. X  
  146. X          case 0:
  147. diff -c /export/home/wht/src/ecu312/ecuicmhelp.c ./ecuicmhelp.c
  148. *** /export/home/wht/src/ecu312/ecuicmhelp.c    Sun Aug 25 17:28:22 1991
  149. --- ./ecuicmhelp.c    Sun Aug 25 14:39:26 1991
  150. ***************
  151. *** 14,19 ****
  152. --- 14,20 ----
  153. X  
  154. X  --------------------------------------------------------------------------*/
  155. X  /*+:EDITS:*/
  156. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  157. X  /*:08-01-1991-03:52-wht@n4hgf-when editing string, set cursor to end */
  158. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  159. X  /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
  160. ***************
  161. *** 259,265 ****
  162. X          waddstr(stdscr,s80);
  163. X  
  164. X          if(!x)
  165. !             waddch(stdscr,(unsigned)sVR);
  166. X          y++;
  167. X          if(y >= LINES - 2)
  168. X          {
  169. --- 260,270 ----
  170. X          waddstr(stdscr,s80);
  171. X  
  172. X          if(!x)
  173. ! #ifdef SVR4
  174. !             wvline(stdscr,sVR & 0x00ff, 1); 
  175. ! #else
  176. !             waddch(stdscr,sVR);
  177. ! #endif
  178. X          y++;
  179. X          if(y >= LINES - 2)
  180. X          {
  181. diff -c /export/home/wht/src/ecu312/eculine.c ./eculine.c
  182. *** /export/home/wht/src/ecu312/eculine.c    Sun Aug 25 17:29:16 1991
  183. --- ./eculine.c    Mon Aug 26 05:51:00 1991
  184. ***************
  185. *** 36,41 ****
  186. --- 36,42 ----
  187. X  
  188. X  ------------------------------------------------------------------------*/
  189. X  /*+:EDITS:*/
  190. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  191. X  /*:08-11-1991-18:06-wht@n4hgf-SCO_TTY_NAMING considerations */
  192. X  /*:08-06-1991-14:18-wht@n4hgf-baud rates below 300 get two stop bits */
  193. X  /*:07-29-1991-01:55-wht@n4hgf-remove unused externs */
  194. ***************
  195. *** 56,61 ****
  196. --- 57,67 ----
  197. X  #include <setjmp.h>
  198. X  
  199. X  extern int errno;
  200. + #ifdef SVR4
  201. + # include <sys/termios.h>
  202. + # include <sys/termiox.h>
  203. + int hx_flag;
  204. + #endif
  205. X  extern int sigint;        /* SIGINT flag: see xmtr_SIGINT_handler */
  206. X  
  207. X  int lgetc_count;
  208. ***************
  209. *** 180,186 ****
  210. X  
  211. X  register actual_count = 0;
  212. X  register char *cptr = lrwt->buffer;
  213. ! register echo_flag = lrwt->echo;
  214. X  int max_count = lrwt->bufsize;
  215. X  char *rtn_val;
  216. X  int timeout_counter;
  217. --- 186,192 ----
  218. X  
  219. X  register actual_count = 0;
  220. X  register char *cptr = lrwt->buffer;
  221. ! register echo_flag = lrwt->echo_flag;
  222. X  int max_count = lrwt->bufsize;
  223. X  char *rtn_val;
  224. X  int timeout_counter;
  225. ***************
  226. *** 284,290 ****
  227. X  register char *cptr = lrwt->buffer;
  228. X  register max_count = lrwt->bufsize;
  229. X  register raw_mode = lrwt->raw_flag & 0x0F;
  230. ! register echo_flag = lrwt->echo;
  231. X  int check_sigint = (lrwt->raw_flag & 0x80);
  232. X  int old_ttymode = get_ttymode();    /* save original tty mode */
  233. X  int fdmask;
  234. --- 290,296 ----
  235. X  register char *cptr = lrwt->buffer;
  236. X  register max_count = lrwt->bufsize;
  237. X  register raw_mode = lrwt->raw_flag & 0x0F;
  238. ! register echo_flag = lrwt->echo_flag;
  239. X  int check_sigint = (lrwt->raw_flag & 0x80);
  240. X  int old_ttymode = get_ttymode();    /* save original tty mode */
  241. X  int fdmask;
  242. ***************
  243. *** 685,690 ****
  244. --- 691,727 ----
  245. X  lRTSCTS_control(flag)
  246. X  int flag;
  247. X  {
  248. + #ifdef SVR4
  249. +     struct termiox flowctrl;
  250. + 
  251. +     ioctl(shm->Liofd, TCGETX, &flowctrl);
  252. +     switch(flag)
  253. +     {
  254. +         case 0:
  255. +             flowctrl.x_hflag &= ~(RTSXOFF | CTSXON);
  256. +             Ltermio.c_iflag |= (IXOFF);
  257. +             break;
  258. + 
  259. +         case 1:
  260. +             flowctrl.x_hflag |= CTSXON;
  261. +             flowctrl.x_hflag &= ~RTSXOFF;
  262. +             Ltermio.c_iflag &= ~(IXON | IXOFF | IXANY);
  263. +             break;
  264. +         case 2:
  265. +             flowctrl.x_hflag |= RTSXOFF;
  266. +             flowctrl.x_hflag &= ~CTSXON;
  267. +             Ltermio.c_iflag &= ~(IXON | IXOFF | IXANY);
  268. +             break;
  269. +         case 3:
  270. +             flowctrl.x_hflag |= (RTSXOFF | CTSXON);
  271. +             Ltermio.c_iflag &= ~(IXON | IXOFF | IXANY);
  272. +             break;
  273. +     }
  274. +     shm->Lxonxoff = Ltermio.c_iflag & (IXON|IXOFF);
  275. +     ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);
  276. +     ioctl(shm->Liofd, TCSETX, &flowctrl);
  277. +     hx_flag = flowctrl.x_hflag;
  278. + #else !SVR4
  279. X  #if defined(RTSFLOW)    /* only SCO */
  280. X      switch(flag)
  281. X      {
  282. ***************
  283. *** 713,719 ****
  284. --- 750,776 ----
  285. X      shm->Lxonxoff = Ltermio.c_iflag & (IXON|IXOFF);
  286. X      ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);
  287. X  
  288. + #else
  289. + #if defined(sun)
  290. +     switch(flag)
  291. +     {
  292. +         case 0:
  293. +             Ltermio.c_iflag |= (IXOFF);
  294. +             Ltermio.c_cflag &= ~(CRTSCTS);
  295. +             break;
  296. + 
  297. +         default:
  298. +             Ltermio.c_iflag &= ~(IXON | IXOFF | IXANY);
  299. +             Ltermio.c_cflag |= ~(CRTSCTS);
  300. +             break;
  301. + 
  302. +     }
  303. +     shm->Lxonxoff = Ltermio.c_iflag & (IXON|IXOFF);
  304. +     ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);
  305. + 
  306. + #endif /* sun */
  307. X  #endif /* RTSFLOW */
  308. + #endif /* SVR4 */
  309. X  }    /* end of lRTSCTS_control */
  310. X  
  311. X  /*+-------------------------------------------------------------------------
  312. ***************
  313. *** 754,762 ****
  314. X              Ltermio.c_iflag |= ISTRIP;
  315. X              break;
  316. X          default:
  317. !             ff(se,"invalid parity: %c ... defaulting to no parity\r\n");
  318. !         case 0:
  319. X          case 'n':
  320. X              Ltermio.c_cflag |= CS8;
  321. X              Ltermio.c_iflag &= ~(ISTRIP);
  322. X              shm->Lparity = 0;
  323. --- 811,821 ----
  324. X              Ltermio.c_iflag |= ISTRIP;
  325. X              break;
  326. X          default:
  327. !             ff(se,"invalid parity: '%c' ... defaulting to no parity\r\n",
  328. !                 to_lower(shm->Lparity));
  329. X          case 'n':
  330. +             shm->Lparity = 0;
  331. +         case 0:
  332. X              Ltermio.c_cflag |= CS8;
  333. X              Ltermio.c_iflag &= ~(ISTRIP);
  334. X              shm->Lparity = 0;
  335. ***************
  336. *** 868,873 ****
  337. --- 927,935 ----
  338. X  
  339. X      lopen_err_str[0] = 0;
  340. X      return(0);
  341. + #ifdef SVR4
  342. +     hx_flag = 0;
  343. + #endif
  344. X  
  345. X  }    /* end of lopen */
  346. X  
  347. ***************
  348. *** 932,943 ****
  349. X  ltoggle_dtr()
  350. X  {
  351. X  struct termio b0t;
  352. ! 
  353. X      b0t = Ltermio;
  354. X      b0t.c_cflag &= ~CBAUD;
  355. X  
  356. X      ioctl(shm->Liofd,TCSETA,(char *)&b0t);        /* drop DTR */
  357. X      Nap(1000L);
  358. X      ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);    /* raise DTR */
  359. X      Nap(300L);
  360. X  
  361. --- 994,1011 ----
  362. X  ltoggle_dtr()
  363. X  {
  364. X  struct termio b0t;
  365. ! #if defined(SVR4) || defined(sun)
  366. ! int tempfd;
  367. ! #endif
  368. X      b0t = Ltermio;
  369. X      b0t.c_cflag &= ~CBAUD;
  370. X  
  371. X      ioctl(shm->Liofd,TCSETA,(char *)&b0t);        /* drop DTR */
  372. X      Nap(1000L);
  373. + #if defined(SVR4) || defined(sun)
  374. +     if ((tempfd = open(shm->Lline, O_RDONLY, 0777)) != -1)
  375. +         close(tempfd);
  376. + #endif
  377. X      ioctl(shm->Liofd,TCSETA,(char *)&Ltermio);    /* raise DTR */
  378. X      Nap(300L);
  379. X  
  380. diff -c /export/home/wht/src/ecu312/eculock.c ./eculock.c
  381. *** /export/home/wht/src/ecu312/eculock.c    Mon Aug 12 01:50:00 1991
  382. --- ./eculock.c    Sun Aug 25 14:39:27 1991
  383. ***************
  384. *** 19,24 ****
  385. --- 19,25 ----
  386. X  aged XENIX revision.
  387. X  ------------------------------------------------------------------------*/
  388. X  /*+:EDITS:*/
  389. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  390. X  /*:08-10-1991-17:39-wht@n4hgf-US_WEGOTIT handling */
  391. X  /*:08-09-1991-11:07-wht@n4hgf-configurable lock directory */
  392. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  393. ***************
  394. *** 52,60 ****
  395. X              status = LOPEN_ENABLED_IN_USE;
  396. X              break;
  397. X          case US_NOTFOUND:    /* not in utmp, or getty dead */
  398. -             status = LOPEN_WE_GOT_IT;    /* not really an error */
  399. X              break;
  400. X          case US_WEGOTIT:    /* we own the line */
  401. X              break;
  402. X          case US_LOGIN:        /* enabled for login, idle */
  403. X              status = ungetty_get_line();
  404. --- 53,61 ----
  405. X              status = LOPEN_ENABLED_IN_USE;
  406. X              break;
  407. X          case US_NOTFOUND:    /* not in utmp, or getty dead */
  408. X              break;
  409. X          case US_WEGOTIT:    /* we own the line */
  410. +             status = LOPEN_WE_GOT_IT;    /* not really an error */
  411. X              break;
  412. X          case US_LOGIN:        /* enabled for login, idle */
  413. X              status = ungetty_get_line();
  414. ***************
  415. *** 100,107 ****
  416. --- 101,112 ----
  417. X  #endif
  418. X  
  419. X      errno = 0;
  420. + #ifdef SVR4
  421. +     sprintf(LTMP_fname,"/var/spool/locks/LTMP.%d",pid);
  422. + #else
  423. X      strcpy(LTMP_fname,lock_dir_name);
  424. X      sprintf(LTMP_fname + strlen(LTMP_fname),"/LTMP.%05d",pid);
  425. + #endif
  426. X      if((fd = creat(LTMP_fname,0444)) < 0)
  427. X      {
  428. X          if(errno == EACCES)
  429. ***************
  430. *** 149,154 ****
  431. --- 154,160 ----
  432. X      if(itmp = make_lock_name(shm->Lline,LLCKname))
  433. X          return(itmp);
  434. X  
  435. + #ifndef SVR4
  436. X      if(itmp = check_utmp())
  437. X      {
  438. X          if(itmp == LOPEN_WE_GOT_IT)        /* if we already have the line ... */
  439. ***************
  440. *** 156,161 ****
  441. --- 162,168 ----
  442. X          if(itmp != LOPEN_ENABLED)        /* if other than enabled idle ... */
  443. X              return(itmp);                /* ... return the error */
  444. X      }
  445. + #endif
  446. X  
  447. X  #if defined(GETTY_LOCKS_TTY)
  448. X      if(!ungetty_ttyname[0])    /* if getty did not lock line */
  449. diff -c /export/home/wht/src/ecu312/ecunumrev.c ./ecunumrev.c
  450. *** /export/home/wht/src/ecu312/ecunumrev.c    Sun Aug 25 17:28:24 1991
  451. --- ./ecunumrev.c    Tue Aug 27 04:57:22 1991
  452. ***************
  453. *** 3,8 ****
  454. --- 3,9 ----
  455. X      wht@n4hgf.Mt-Park.GA.US
  456. X  ------------------------------------------------------------------------*/
  457. X  /*+:EDITS:*/
  458. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  459. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  460. X  /*:07-12-1991-14:14-wht@n4hgf-GCC140 differentiation */
  461. X  /*:04-27-1991-01:52-wht@n4hgf-overhaul revision numbers */
  462. ***************
  463. *** 22,51 ****
  464. X  #endif
  465. X  
  466. X  #ifdef WHT
  467. ! char *numeric_revision = "x3.54";
  468. X  #else
  469. X  char *numeric_revision = "3";
  470. X  #endif
  471. X  char *revstr = "";
  472. X  
  473. - #if defined(ISC)
  474. - char *revision_modifier = "-386i wht@n4hgf";
  475. - #else
  476. - #if defined(M_UNIX)
  477. - char *revision_modifier = "-386u wht@n4hgf";
  478. - #else
  479. - #if defined(M_I386)
  480. - #if defined(NO_SELECT)
  481. - char *revision_modifier = "-386n wht@n4hgf";
  482. - #else
  483. - char *revision_modifier = "-386s wht@n4hgf";
  484. - #endif /*  */
  485. - #else
  486. - char *revision_modifier = "-286n wht@n4hgf";
  487. - #endif /* M_I386 */
  488. - #endif /* M_UNIX */
  489. - #endif /* ISC */
  490. - 
  491. X  /*+-------------------------------------------------------------------------
  492. X      build_revision_string()
  493. X  --------------------------------------------------------------------------*/
  494. --- 23,34 ----
  495. X  #endif
  496. X  
  497. X  #ifdef WHT
  498. ! char *numeric_revision = "x3.6r";
  499. X  #else
  500. X  char *numeric_revision = "3";
  501. X  #endif
  502. X  char *revstr = "";
  503. X  
  504. X  /*+-------------------------------------------------------------------------
  505. X      build_revision_string()
  506. X  --------------------------------------------------------------------------*/
  507. ***************
  508. *** 58,66 ****
  509. X  
  510. X  #if defined(M_I286)
  511. X      strcat(s128,"286");
  512. ! #endif /* M_I286 */
  513. ! 
  514. ! #if defined(M_I386) || defined(i386)
  515. X      strcat(s128,"386");
  516. X  #    if defined(M_XENIX)
  517. X  #        if defined(NO_SELECT)
  518. --- 41,48 ----
  519. X  
  520. X  #if defined(M_I286)
  521. X      strcat(s128,"286");
  522. ! #else
  523. ! #if defined(M_I386) || defined(i386) && (!defined(sun) && !defined(SVR4))
  524. X      strcat(s128,"386");
  525. X  #    if defined(M_XENIX)
  526. X  #        if defined(NO_SELECT)
  527. ***************
  528. *** 72,81 ****
  529. X  #    if defined(M_UNIX)
  530. X          strcat(s128,"u");
  531. X  #    endif /* M_UNIX */
  532. ! #    if defined(ISC)
  533. !         strcat(s128,"i");
  534. ! #    endif /* ISC */
  535. X  #endif /* M_I386 || i386 */
  536. X  
  537. X  #if defined(__GNUC__)
  538. X  #if defined(GCC140)
  539. --- 54,71 ----
  540. X  #    if defined(M_UNIX)
  541. X          strcat(s128,"u");
  542. X  #    endif /* M_UNIX */
  543. ! #else
  544. ! #if defined(sun)
  545. !     strcat(s128,"sun");
  546. ! #else
  547. ! #if defined(SVR4)
  548. !     strcat(s128,"SVR4");
  549. ! #else
  550. ! # include "porting.attention.needed.here"
  551. ! #endif /* SVR4 */
  552. ! #endif /* sun */
  553. X  #endif /* M_I386 || i386 */
  554. + #endif /* M_I286 */
  555. X  
  556. X  #if defined(__GNUC__)
  557. X  #if defined(GCC140)
  558. ***************
  559. *** 100,106 ****
  560. X          exit(255);
  561. X      }
  562. X      strcpy(revstr,s128);
  563. - 
  564. X  
  565. X  }    /* end of build_revision_string */
  566. X  
  567. --- 90,95 ----
  568. diff -c /export/home/wht/src/ecu312/ecuphone.c ./ecuphone.c
  569. *** /export/home/wht/src/ecu312/ecuphone.c    Sun Aug 25 17:29:18 1991
  570. --- ./ecuphone.c    Sun Aug 25 14:39:28 1991
  571. ***************
  572. *** 71,76 ****
  573. --- 71,78 ----
  574. X  
  575. X  --------------------------------------------------------------------------*/
  576. X  /*+:EDITS:*/
  577. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  578. + /*:08-15-1991-18:13-wht@n4hgf-do not allow edit of non-existent entry */
  579. X  /*:08-11-1991-19:56-wht@n4hgf-soup up tty name for ISC vs. SCO */
  580. X  /*:08-07-1991-13:48-root@n4hgf-w subcommand was not asking both questions */
  581. X  /*:08-01-1991-03:52-wht@n4hgf-when editing string, set cursor to end */
  582. ***************
  583. *** 206,213 ****
  584. --- 208,219 ----
  585. X          else
  586. X          {
  587. X              itmp = 10;
  588. + #ifdef SVR4
  589. +             whline(dirw, (unsigned long)(sHR & 0x00ff), itmp);
  590. + #else
  591. X              while(itmp--)
  592. X                  waddch(dirw,(unsigned)sHR);
  593. + #endif
  594. X          }
  595. X          wrefresh(dirw);
  596. X      }
  597. ***************
  598. *** 435,443 ****
  599. X      waddstr(dirw,s80);
  600. X      waddch(dirw,' ');
  601. X      getyx(dirw,itmp,x);
  602. X      while(x < DIRW_COLS - 1)
  603. X          waddch(dirw,sHR),x++;
  604. ! 
  605. X  }    /* end of dirw_display_phonedir_name */
  606. X  
  607. X  /*+-----------------------------------------------------------------------
  608. --- 441,452 ----
  609. X      waddstr(dirw,s80);
  610. X      waddch(dirw,' ');
  611. X      getyx(dirw,itmp,x);
  612. + #ifdef SVR4
  613. +     whline(dirw, (unsigned long)(sHR & 0x00ff), DIRW_COLS - 1 - x);
  614. + #else
  615. X      while(x < DIRW_COLS - 1)
  616. X          waddch(dirw,sHR),x++;
  617. ! #endif
  618. X  }    /* end of dirw_display_phonedir_name */
  619. X  
  620. X  /*+-----------------------------------------------------------------------
  621. ***************
  622. *** 614,619 ****
  623. --- 623,632 ----
  624. X  {
  625. X  register y,x;
  626. X  
  627. + #ifdef SVR4
  628. +     wmove(dirw,DIRW_LINES - DIRW_BOT_LINES,1);
  629. +     whline(dirw, (unsigned long)(sHR & 0x00ff), DIRW_COLS - 2);
  630. + #else
  631. X      wmove(dirw,DIRW_LINES - DIRW_BOT_LINES,0);
  632. X      waddch(dirw,sLT);
  633. X      getyx(dirw,y,x);
  634. ***************
  635. *** 620,625 ****
  636. --- 633,639 ----
  637. X      while(x++ < (DIRW_COLS - 1))
  638. X          waddch(dirw,sHR);
  639. X      waddch(dirw,sRT);
  640. + #endif
  641. X      if(pde_marked_for_redial_count)
  642. X      {
  643. X          wmove(dirw,DIRW_LINES - DIRW_BOT_LINES,2);
  644. ***************
  645. *** 650,656 ****
  646. --- 664,674 ----
  647. X      wstandout(dirw);
  648. X      wprintw(dirw,
  649. X  " entry name %c telephone number %c tty %c baud P %c description                   ",
  650. + #ifdef SVR4
  651. +         '|','|','|','|');
  652. + #else
  653. X          sVR,sVR,sVR,sVR);
  654. + #endif
  655. X      wstandend(dirw);
  656. X      dirw_display_phonedir_name();
  657. X      dirw_display_config();
  658. ***************
  659. *** 679,686 ****
  660. --- 697,708 ----
  661. X      if((itmp = strlen(msg)) == 0)
  662. X      {
  663. X          itmp2 = last_msglen + 2;
  664. + #ifdef SVR4
  665. +         whline(dirw, (unsigned long)(sHR & 0x00ff), itmp2);
  666. + #else
  667. X          for(itmp = 0; itmp < itmp2; itmp++)
  668. X              waddch(dirw,(unsigned)sHR);
  669. + #endif
  670. X          last_msglen = 0;
  671. X      }
  672. X      else
  673. ***************
  674. *** 701,708 ****
  675. --- 723,734 ----
  676. X          waddch(dirw,' ');
  677. X          if((itmp2 = last_msglen - itmp) > 0)
  678. X          {
  679. + #ifdef SVR4
  680. +             whline(dirw, (unsigned long)(sHR & 0x00ff), itmp2);
  681. + #else
  682. X              while(itmp2--)
  683. X                  waddch(dirw,(unsigned)sHR);
  684. + #endif
  685. X          }
  686. X          last_msglen = itmp;        /* remember last message length */
  687. X      }
  688. ***************
  689. *** 719,725 ****
  690. --- 745,756 ----
  691. X  int stand_out;
  692. X  {
  693. X      wmove(scrw,line,0);
  694. + #ifdef SVR4
  695. +     wvline(scrw, (unsigned long)(sVR & 0x00ff), 1);
  696. +     wmove(scrw,line,1);
  697. + #else
  698. X      waddch(scrw,(unsigned)sVR);
  699. + #endif
  700. X  
  701. X      if(tpde->redial)
  702. X      {
  703. ***************
  704. *** 753,760 ****
  705. --- 784,806 ----
  706. X  
  707. X      pde_display_logical(line,tpde,stand_out);
  708. X      waddch(scrw,' ');
  709. + #ifdef SVR4
  710. +     wmove(scrw, line, 13);
  711. +     waddch(scrw,'|');
  712. + #else
  713. X      waddch(scrw,(unsigned)sVR);
  714. + #endif
  715. X      waddch(scrw,' ');
  716. + #ifdef SVR4
  717. +     wprintw(scrw,"%-16.16s %c",tpde->telno,'|');
  718. +     if(tpde->tty[0])
  719. +         wprintw(scrw,"%-5.5s%c",tpde->tty,'|');
  720. +     else
  721. +         wprintw(scrw,"Any  %c",'|');
  722. +     wprintw(scrw,"%5u %c %c ",tpde->baud,
  723. +         (tpde->parity) ? to_upper(tpde->parity) : 'N','|');
  724. +     wprintw(scrw,"%-29.29s",tpde->descr);
  725. + #else
  726. X      wprintw(scrw,"%-16.16s %c",tpde->telno,sVR);
  727. X      if(tpde->tty[0])
  728. X          wprintw(scrw,"%-5.5s%c",tpde->tty,sVR);
  729. ***************
  730. *** 763,768 ****
  731. --- 809,815 ----
  732. X      wprintw(scrw,"%5u %c %c ",tpde->baud,
  733. X          (tpde->parity) ? to_upper(tpde->parity) : 'N',sVR);
  734. X      wprintw(scrw,"%-29.29s %c",tpde->descr,sVR);
  735. + #endif
  736. X      return(0);
  737. X  
  738. X  }    /* end of pde_display */
  739. ***************
  740. *** 791,800 ****
  741. --- 838,856 ----
  742. X          else
  743. X          {
  744. X              wmove(scrw,line,0);
  745. + #ifdef SVR4
  746. +             wvline(scrw, (unsigned long)(sVR & 0x00ff), 1);
  747. +             wmove(scrw,line,1);
  748. + #else
  749. X              waddch(scrw,(unsigned)sVR);
  750. + #endif
  751. X              wclrtoeol(scrw);
  752. X              wmove(scrw,line,SCRW_COLS - 1);
  753. + #ifdef SVR4
  754. +             wvline(scrw, (unsigned long)(sVR & 0x00ff), 1);
  755. + #else
  756. X              waddch(scrw,(unsigned)sVR);
  757. + #endif
  758. X          }
  759. X      }
  760. X      wrefresh(scrw);
  761. ***************
  762. *** 1119,1124 ****
  763. --- 1175,1183 ----
  764. X  int wgpos = -1;
  765. X  char s80[80];
  766. X  
  767. +     if(!check_curr_pde())
  768. +         return;
  769. + 
  770. X      wmove(addw,9,2);
  771. X      waddstr(addw,prompt);
  772. X  
  773. ***************
  774. *** 2099,2110 ****
  775. X              strcpy(shm->Lline,"/dev/tty");
  776. X          strcat(shm->Lline,tpde->tty);
  777. X  #else
  778. - #if defined(ISC)
  779. X          strcpy(shm->Lline,"/dev/");
  780. X          strcat(shm->Lline,tpde->tty);
  781. - #else
  782. - #    include "need.porting.attention.here"
  783. - #endif /* ISC */
  784. X  #endif /* M_SYSV */
  785. X      }
  786. X      else    /* "Any" */
  787. --- 2158,2165 ----
  788. diff -c /export/home/wht/src/ecu312/ecurcvr.c ./ecurcvr.c
  789. *** /export/home/wht/src/ecu312/ecurcvr.c    Thu Jul 25 12:56:00 1991
  790. --- ./ecurcvr.c    Mon Aug 26 16:49:35 1991
  791. ***************
  792. *** 1,7 ****
  793. ! #define DEFENSIVE        /* lots of changes this rev: defining this
  794. !                          * will make for screwed up screen image
  795. !                          * but no core dump if nassssty bugs show up
  796. !                          */
  797. X  /* #define ANSI_DEBUG */        /* debug ansi */
  798. X  /* #define ANSI_DEBUG_2 */        /* debug ansi intensive output */
  799. X  /* #define ANSI_DEBUG_3 */        /* debug ansi selected output */
  800. --- 1,4 ----
  801. ! /* #define DEFENSIVE */
  802. X  /* #define ANSI_DEBUG */        /* debug ansi */
  803. X  /* #define ANSI_DEBUG_2 */        /* debug ansi intensive output */
  804. X  /* #define ANSI_DEBUG_3 */        /* debug ansi selected output */
  805. ***************
  806. *** 49,54 ****
  807. --- 46,52 ----
  808. X  
  809. X  --------------------------------------------------------------------------*/
  810. X  /*+:EDITS:*/
  811. + /*:08-26-1991-16:39-wht@n4hgf2-SD was still hopelessly manic */
  812. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  813. X  /*:07-05-1991-06:13-wht@n4hgf-SD was in baaaaadd shape */
  814. X  /*:01-09-1991-22:31-wht@n4hgf-ISC port */
  815. ***************
  816. *** 686,692 ****
  817. X      if(!tty_is_ansi)
  818. X      {
  819. X          tcap_cursor(0,0);
  820. !         tcap_insert_lines(count);
  821. X          tcap_cursor(shm->cursor_y,shm->cursor_x);
  822. X      }
  823. X  
  824. --- 684,690 ----
  825. X      if(!tty_is_ansi)
  826. X      {
  827. X          tcap_cursor(0,0);
  828. !         tcap_insert_lines(param);
  829. X          tcap_cursor(shm->cursor_y,shm->cursor_x);
  830. X      }
  831. X  
  832. diff -c /export/home/wht/src/ecu312/ecusetup.c ./ecusetup.c
  833. *** /export/home/wht/src/ecu312/ecusetup.c    Sun Aug 25 17:29:19 1991
  834. --- ./ecusetup.c    Mon Aug 26 15:56:02 1991
  835. ***************
  836. *** 34,39 ****
  837. --- 34,40 ----
  838. X  
  839. X  --------------------------------------------------------------------------*/
  840. X  /*+:EDITS:*/
  841. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  842. X  /*:08-12-1991-00:58-wht@n4hgf-ISC tty names */
  843. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  844. X  /*:07-17-1991-07:04-wht@n4hgf-avoid SCO UNIX nap bug */
  845. ***************
  846. *** 73,90 ****
  847. X  #define DESCR_LX    3
  848. X  
  849. X  #define TTY_Y        6
  850. - #if defined(M_SYSV)
  851. - #define TTY_X        16
  852. - #define TTY_LEN        5
  853. - #else
  854. - #if defined(ISC)
  855. X  #define TTY_X        13
  856. X  #define TTY_LEN        8
  857. - #else
  858. - #    include "porting.attention.needed.here"
  859. - #endif /* ISC */
  860. - #endif /* M_SYSV */
  861. - 
  862. X  #define TTY_LX        3
  863. X  
  864. X  #define TTYOPN_LY    6
  865. --- 74,81 ----
  866. ***************
  867. *** 150,157 ****
  868. X      if((itmp = strlen(msg)) == 0)
  869. X      {
  870. X          itmp2 = *last_msglen + 2;
  871. !         for(itmp = 0; itmp < itmp2; itmp++)
  872. !             waddch(setw,fillch & 0xFF);
  873. X          *last_msglen = 0;
  874. X      }
  875. X      else
  876. --- 141,152 ----
  877. X      if((itmp = strlen(msg)) == 0)
  878. X      {
  879. X          itmp2 = *last_msglen + 2;
  880. ! #ifdef SVR4
  881. !         whline(setw, (unsigned long)(fillch & 0x00ff), itmp2);
  882. ! #else
  883. !           for(itmp = 0; itmp < itmp2; itmp++)
  884. !             waddch(setw,fillch & 0xFF); 
  885. ! #endif
  886. X          *last_msglen = 0;
  887. X      }
  888. X      else
  889. ***************
  890. *** 172,179 ****
  891. X          waddch(setw,' ');
  892. X          if((itmp2 = *last_msglen - itmp) > 0)
  893. X          {
  894. X              while(itmp2--)
  895. !                 waddch(setw,fillch & 0xFF);
  896. X          }
  897. X          *last_msglen = itmp;        /* remember last message length */
  898. X      }
  899. --- 167,178 ----
  900. X          waddch(setw,' ');
  901. X          if((itmp2 = *last_msglen - itmp) > 0)
  902. X          {
  903. + #ifdef SVR4
  904. +             whline(setw, (unsigned long)(fillch & 0x00ff), itmp2);
  905. + #else
  906. X              while(itmp2--)
  907. !                   waddch(setw,fillch & 0xFF); 
  908. ! #endif
  909. X          }
  910. X          *last_msglen = itmp;        /* remember last message length */
  911. X      }
  912. ***************
  913. *** 188,194 ****
  914. X  char *msg;
  915. X  {
  916. X  static int last_msglen = 0;
  917. - 
  918. X      setw_msg(msg,SETW_MSG_BOT_Y,sHR,&last_msglen);
  919. X  }    /* end of setw_bot_msg */
  920. X  
  921. --- 187,192 ----
  922. ***************
  923. *** 250,265 ****
  924. X  void
  925. X  setup_display_tty()
  926. X  {
  927. X      clear_area(setw,TTY_Y,TTY_X,TTY_LEN);
  928. ! #if defined(M_SYSV)
  929. !     waddstr(setw,&shm->Lline[8]);
  930. ! #else
  931. ! #if defined(ISC)
  932. !     waddstr(setw,&shm->Lline[5]);
  933. ! #else
  934. ! #    include "porting.attention.needed.here"
  935. ! #endif /* ISC */
  936. ! #endif /* M_SYSV */
  937. X  
  938. X  }    /* end of setup_display_tty */
  939. X  
  940. --- 248,259 ----
  941. X  void
  942. X  setup_display_tty()
  943. X  {
  944. + char s[TTY_LEN + 1];
  945. + 
  946. +     strncpy(s,shm->Lline + 5,TTY_LEN);
  947. +     s[TTY_LEN] = 0;
  948. X      clear_area(setw,TTY_Y,TTY_X,TTY_LEN);
  949. !     waddstr(setw,s);
  950. X  
  951. X  }    /* end of setup_display_tty */
  952. X  
  953. ***************
  954. *** 485,508 ****
  955. X  
  956. X              case 1:
  957. X  #if defined(M_SYSV)
  958. !                 setw_bot_msg("comm line: i.e., 1a, 2a, 4a, 4b, 4c, 4d");
  959. ! #define _TTYPOS 8
  960. X  #else
  961. ! #if defined(ISC)
  962. X                  setw_bot_msg("comm line: i.e., acu00, tty00");
  963. - #define _TTYPOS 5
  964. X  #else
  965. X  #    include "porting.attention.needed.here"
  966. X  #endif /* ISC */
  967. X  #endif /* M_SYSV */
  968. X  
  969. X                  setup_display_tty();
  970. !                 strcpy(s80,&shm->Lline[_TTYPOS]);
  971. X                   itmp = wingets(setw,TTY_Y,TTY_X,s80,TTY_LEN + 1,&delim,
  972. X                      1,(int *)0);
  973. X                  setw_err_msg("");
  974. X                  if(strchr(use_input_delim,delim))
  975. !                     strcpy(&shm->Lline[_TTYPOS],s80);
  976. X                  setup_display_tty();
  977. X                  break;
  978. X  
  979. --- 479,504 ----
  980. X  
  981. X              case 1:
  982. X  #if defined(M_SYSV)
  983. !                 setw_bot_msg("comm line: i.e., tty1a, tty4d");
  984. X  #else
  985. ! #if defined(ISC) || defined(SVR4)
  986. X                  setw_bot_msg("comm line: i.e., acu00, tty00");
  987. X  #else
  988. + #if defined(sun)
  989. +                 setw_bot_msg("comm line: i.e., cua0, ttyd0");
  990. + #else
  991. X  #    include "porting.attention.needed.here"
  992. + #endif /* sun */
  993. X  #endif /* ISC */
  994. X  #endif /* M_SYSV */
  995. X  
  996. X                  setup_display_tty();
  997. !                 strcpy(s80,&shm->Lline[5]);
  998. X                   itmp = wingets(setw,TTY_Y,TTY_X,s80,TTY_LEN + 1,&delim,
  999. X                      1,(int *)0);
  1000. X                  setw_err_msg("");
  1001. X                  if(strchr(use_input_delim,delim))
  1002. !                     strcpy(&shm->Lline[5],s80);
  1003. X                  setup_display_tty();
  1004. X                  break;
  1005. X  
  1006. ***************
  1007. *** 593,598 ****
  1008. --- 589,595 ----
  1009. X  
  1010. X          switch(delim)
  1011. X          {
  1012. +             case XFcurup:
  1013. X              case CTL_B:
  1014. X                  if(input_state)
  1015. X                      input_state--;
  1016. ***************
  1017. *** 600,605 ****
  1018. --- 597,603 ----
  1019. X                      input_state = 6;
  1020. X                  break;
  1021. X  
  1022. +             case XFcurdn:
  1023. X              case TAB:
  1024. X              case NL:
  1025. X                  input_state++;
  1026. ***************
  1027. *** 681,687 ****
  1028. X      DCE_dial();
  1029. X  #endif
  1030. X      }
  1031. !     else
  1032. X          start_rcvr_process(1);
  1033. X  
  1034. X  }    /* end of setup_screen */
  1035. --- 679,685 ----
  1036. X      DCE_dial();
  1037. X  #endif
  1038. X      }
  1039. !     else 
  1040. X          start_rcvr_process(1);
  1041. X  
  1042. X  }    /* end of setup_screen */
  1043. diff -c /export/home/wht/src/ecu312/ecushm.h ./ecushm.h
  1044. *** /export/home/wht/src/ecu312/ecushm.h    Thu Jul 25 12:56:00 1991
  1045. --- ./ecushm.h    Fri Aug 23 14:21:59 1991
  1046. ***************
  1047. *** 4,9 ****
  1048. --- 4,10 ----
  1049. X      wht@n4hgf.Mt-Park.GA.US
  1050. X  --------------------------------------------------------------------------*/
  1051. X  /*+:EDITS:*/
  1052. + /*:08-21-1991-01:34-wht@n4hgf-FAR depends only on M_I286 */
  1053. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  1054. X  /*:12-19-1990-17:09-wht@n4hgf-make cursor variables unsigned */
  1055. X  /*:11-30-1990-19:01-wht@n4hgf-add ttyinit_param */
  1056. ***************
  1057. *** 10,19 ****
  1058. X  /*:11-28-1990-17:43-wht@n4hgf-move cursor_y, cursor_x to right after revision */
  1059. X  /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
  1060. X  
  1061. ! #if defined(i386) || defined(M_I386)
  1062. ! #define FAR
  1063. ! #else
  1064. X  #define FAR far
  1065. X  #endif
  1066. X  
  1067. X  #if !defined(ushort)
  1068. --- 11,20 ----
  1069. X  /*:11-28-1990-17:43-wht@n4hgf-move cursor_y, cursor_x to right after revision */
  1070. X  /*:08-14-1990-20:40-wht@n4hgf-ecu3.00-flush old edit history */
  1071. X  
  1072. ! #if defined(M_I286)
  1073. X  #define FAR far
  1074. + #else
  1075. + #define FAR
  1076. X  #endif
  1077. X  
  1078. X  #if !defined(ushort)
  1079. diff -c /export/home/wht/src/ecu312/ecusighdl.c ./ecusighdl.c
  1080. *** /export/home/wht/src/ecu312/ecusighdl.c    Sun Aug 25 17:29:20 1991
  1081. --- ./ecusighdl.c    Mon Aug 26 16:08:51 1991
  1082. ***************
  1083. *** 5,11 ****
  1084. X  
  1085. X    Defined functions:
  1086. X      child_signals()
  1087. -     termecu(sig)
  1088. X      kill_rcvr_process(sig)
  1089. X      rcvr_SIGHUP_handler()
  1090. X      rcvr_SIGINT_handler()
  1091. --- 5,10 ----
  1092. ***************
  1093. *** 16,31 ****
  1094. X      rcvr_death_handler(sig)
  1095. X      rcvr_signals()
  1096. X      start_rcvr_process(notify_flag)
  1097. X      xmtr_SIGHUP_handler(sig)
  1098. X      xmtr_SIGINT_handler()
  1099. X      xmtr_SIGTERM_handler(sig)
  1100. X      xmtr_SIGUSR2_handler()
  1101. !     xmtr_bsd4_SIGCHLD_handler()
  1102. X      xmtr_signals()
  1103. -     xmtr_SIGCLD_handler()
  1104. X  
  1105. X  ------------------------------------------------------------------------*/
  1106. X  /*+:EDITS:*/
  1107. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  1108. X  /*:07-17-1991-07:04-wht@n4hgf-avoid SCO UNIX nap bug */
  1109. X  /*:06-29-1991-15:42-wht@n4hgf-if WHT and xterm, play with title bar */
  1110. --- 15,33 ----
  1111. X      rcvr_death_handler(sig)
  1112. X      rcvr_signals()
  1113. X      start_rcvr_process(notify_flag)
  1114. +     termecu(sig)
  1115. +     termecu_code_text(code)
  1116. +     xmtr_SIGCLD_handler()
  1117. X      xmtr_SIGHUP_handler(sig)
  1118. X      xmtr_SIGINT_handler()
  1119. X      xmtr_SIGTERM_handler(sig)
  1120. X      xmtr_SIGUSR2_handler()
  1121. !     xmtr_death_handler(sig)
  1122. X      xmtr_signals()
  1123. X  
  1124. X  ------------------------------------------------------------------------*/
  1125. X  /*+:EDITS:*/
  1126. + /*:08-25-1991-23:56-wht@n4hgf2-handle xmtr core dump gracefully */
  1127. X  /*:07-25-1991-12:56-wht@n4hgf-ECU release 3.10 */
  1128. X  /*:07-17-1991-07:04-wht@n4hgf-avoid SCO UNIX nap bug */
  1129. X  /*:06-29-1991-15:42-wht@n4hgf-if WHT and xterm, play with title bar */
  1130. ***************
  1131. *** 69,74 ****
  1132. --- 71,77 ----
  1133. X  void xmtr_SIGHUP_handler();
  1134. X  void xmtr_SIGTERM_handler();
  1135. X  void xmtr_SIGCLD_handler();
  1136. + void Xcvr_death_handler();
  1137. X  void rcvr_common_signal_handler();
  1138. X  void rcvr_death_handler();
  1139. X  
  1140. ***************
  1141. *** 351,371 ****
  1142. X  {
  1143. X      rcvr_common_signal_handler();
  1144. X  }
  1145. X  void
  1146. X  rcvr_death_handler(sig)
  1147. X  int sig;
  1148. X  {
  1149. !     fprintf(stderr,"\r\nreceiver process caught signal %s\r\n",
  1150. !         signal_name_text(sig));
  1151. !     fprintf(stderr,"cursor y=%d x=%d\r\n",shm->cursor_y,shm->cursor_x);
  1152. ! #ifdef SIGABRT
  1153. !     signal(SIGABRT,SIG_DFL);
  1154. X  #else
  1155. !     signal(SIGIOT,SIG_IOT);
  1156. X  #endif
  1157. !     abort();
  1158. X      _exit(-1);
  1159. ! }
  1160. X  /*+-------------------------------------------------------------------------
  1161. X      xmtr_SIGINT_handler()
  1162. X  --------------------------------------------------------------------------*/
  1163. --- 354,383 ----
  1164. X  {
  1165. X      rcvr_common_signal_handler();
  1166. X  }
  1167. + /*+-------------------------------------------------------------------------
  1168. +     rcvr_death_handler(sig)
  1169. + --------------------------------------------------------------------------*/
  1170. X  void
  1171. X  rcvr_death_handler(sig)
  1172. X  int sig;
  1173. X  {
  1174. !     int itmp;
  1175. ! #ifdef lint
  1176. !     int *open_elevator_shaft = (int *)0;
  1177. X  #else
  1178. !     int *open_elevator_shaft = (int *)(shm - 1);
  1179. X  #endif
  1180. ! 
  1181. !     ttymode(0);
  1182. !     fprintf(stderr,"\r\nreceiver process caught signal %s\r\n",
  1183. !         signal_name_text(sig));
  1184. !     fprintf(stderr,"cursor y=%d x=%d\r\n",shm->cursor_y,shm->cursor_x);
  1185. !     signal(SIGSEGV,SIG_DFL);
  1186. !     signal(SIGBUS,SIG_DFL);
  1187. !     itmp = *open_elevator_shaft;
  1188. X      _exit(-1);
  1189. ! }    /* end of rcvr_death_handler */
  1190. ! 
  1191. X  /*+-------------------------------------------------------------------------
  1192. X      xmtr_SIGINT_handler()
  1193. X  --------------------------------------------------------------------------*/
  1194. ***************
  1195. *** 401,406 ****
  1196. --- 413,445 ----
  1197. X  }
  1198. X  
  1199. X  /*+-------------------------------------------------------------------------
  1200. +     xmtr_death_handler(sig)
  1201. + --------------------------------------------------------------------------*/
  1202. + void
  1203. + xmtr_death_handler(sig)
  1204. + int sig;
  1205. + {
  1206. + int itmp;
  1207. + #ifdef lint
  1208. + int *open_elevator_shaft = (int *)0;
  1209. + #else
  1210. + int *open_elevator_shaft = (int *)(shm - 1);
  1211. + #endif
  1212. + 
  1213. +     ttymode(0);
  1214. +     fprintf(stderr,"\r\ntransmitter process caught signal %s\n",
  1215. +         signal_name_text(sig));
  1216. +     for(itmp = 1; itmp < NSIG; itmp++)
  1217. +         signal(itmp,SIG_IGN);
  1218. +     kill_rcvr_process(SIGUSR1);
  1219. +     signal(SIGSEGV,SIG_DFL);
  1220. +     signal(SIGBUS,SIG_DFL);
  1221. +     itmp = *open_elevator_shaft;
  1222. +     printf("itmp=%d oes=%08lx\n",itmp,open_elevator_shaft);
  1223. +     _exit(-1);
  1224. + }    /* end of xmtr_death_handler */
  1225. + 
  1226. + /*+-------------------------------------------------------------------------
  1227. X      xmtr_SIGCLD_handler()
  1228. X  --------------------------------------------------------------------------*/
  1229. X  void
  1230. ***************
  1231. *** 453,458 ****
  1232. --- 492,498 ----
  1233. X  void
  1234. X  xmtr_signals()
  1235. X  {
  1236. + 
  1237. X      signal(SIGHUP,xmtr_SIGHUP_handler);
  1238. X      signal(SIGQUIT,SIG_IGN);
  1239. X      signal(SIGINT,xmtr_SIGINT_handler);
  1240. ***************
  1241. *** 459,464 ****
  1242. --- 499,525 ----
  1243. X      signal(SIGTERM,xmtr_SIGTERM_handler);
  1244. X      signal(SIGCLD,xmtr_SIGCLD_handler);
  1245. X      signal(SIGUSR2,xmtr_SIGUSR2_handler);
  1246. + #ifdef SIGILL
  1247. +     signal(SIGILL,xmtr_death_handler);
  1248. + #endif
  1249. + #ifdef SIGIOT
  1250. +     signal(SIGIOT,xmtr_death_handler);
  1251. + #endif
  1252. + #ifdef SIGABRT
  1253. +     signal(SIGABRT,xmtr_death_handler);
  1254. + #endif
  1255. + #ifdef SIGEMT
  1256. +     signal(SIGEMT,xmtr_death_handler);
  1257. + #endif
  1258. + #ifdef SIGFPE
  1259. +     signal(SIGFPE,xmtr_death_handler);
  1260. + #endif
  1261. + #ifdef SIGBUS
  1262. +     signal(SIGBUS,xmtr_death_handler);
  1263. + #endif
  1264. + #ifdef SIGSEGV
  1265. +     signal(SIGSEGV,xmtr_death_handler);
  1266. + #endif
  1267. X  
  1268. X  }    /* end of xmtr_signals */
  1269. X  
  1270. ***************
  1271. *** 472,478 ****
  1272. X      signal(SIGQUIT,SIG_IGN);
  1273. X  #ifdef RCVR_CLEAN_CORE_DUMP
  1274. X      signal(SIGILL,SIG_DFL);
  1275. -     signal(SIGTRAP,SIG_DFL);
  1276. X      signal(SIGIOT,SIG_DFL);
  1277. X      signal(SIGABRT,SIG_DFL);
  1278. X      signal(SIGEMT,SIG_DFL);
  1279. --- 533,538 ----
  1280. ***************
  1281. *** 482,490 ****
  1282. X  #else
  1283. X  #ifdef SIGILL
  1284. X      signal(SIGILL,rcvr_death_handler);
  1285. - #endif
  1286. - #ifdef SIGTRAP
  1287. -     signal(SIGTRAP,rcvr_death_handler);
  1288. X  #endif
  1289. X  #ifdef SIGIOT
  1290. X      signal(SIGIOT,rcvr_death_handler);
  1291. --- 542,547 ----
  1292. diff -c /export/home/wht/src/ecu312/ecutty.c ./ecutty.c
  1293. *** /export/home/wht/src/ecu312/ecutty.c    Sun Aug 25 17:29:21 1991
  1294. --- ./ecutty.c    Mon Aug 26 05:29:24 1991
  1295. ***************
  1296. *** 1,3 ****
  1297. --- 1,4 ----
  1298. + /* #define NAP_DEBUG */
  1299. X  /*+-------------------------------------------------------------------------
  1300. X      ecutty.c - local tty (console) functions
  1301. X      wht@n4hgf.Mt-Park.GA.US
  1302. ***************
  1303. *** 43,48 ****
  1304. --- 44,51 ----
  1305. X  
  1306. X  --------------------------------------------------------------------------*/
  1307. X  /*+:EDITS:*/
  1308. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  1309. + /*:08-17-1991-18:29-wht@n4hgf-add kbdtest command */
  1310. X  /*:07-25-1991-12:57-wht@n4hgf-ECU release 3.10 */
  1311. X  /*:07-14-1991-18:18-wht@n4hgf-new ttygets functions */
  1312. X  /*:07-10-1991-16:19-wht@n4hgf-improve multi-char func key read timeout */
  1313. ***************
  1314. *** 64,72 ****
  1315. X  #if defined(M_SYSV)
  1316. X  #   include <sys/machdep.h>
  1317. X  #else
  1318. X  #  include <sys/at_ansi.h>
  1319. X  #  include <sys/kd.h>
  1320. ! #endif
  1321. X  
  1322. X  #define DEFINE_TTY_DATA
  1323. X  #include "ecutty.h"
  1324. --- 67,77 ----
  1325. X  #if defined(M_SYSV)
  1326. X  #   include <sys/machdep.h>
  1327. X  #else
  1328. + #if defined(ISC)
  1329. X  #  include <sys/at_ansi.h>
  1330. X  #  include <sys/kd.h>
  1331. ! #endif /* ISC */
  1332. ! #endif /* M_SYSV */
  1333. X  
  1334. X  #define DEFINE_TTY_DATA
  1335. X  #include "ecutty.h"
  1336. ***************
  1337. *** 112,117 ****
  1338. --- 117,123 ----
  1339. X  extern int COLS;
  1340. X  extern char screen_dump_file_name[];
  1341. X  
  1342. + char *kde_text();
  1343. X  
  1344. X  uint LINESxCOLS;
  1345. X  int current_ttymode = 0;
  1346. ***************
  1347. *** 120,125 ****
  1348. --- 126,132 ----
  1349. X  int tty_is_pts;
  1350. X  int tty_is_pty;
  1351. X  int tty_is_multiscreen;
  1352. + static int kbd_test_active = 0;
  1353. X  
  1354. X  struct termio tty_termio_at_entry;
  1355. X  struct termio tty_termio_current;
  1356. ***************
  1357. *** 147,152 ****
  1358. --- 154,168 ----
  1359. X  uchar *dole_out_tgc_accum = (uchar *)0;
  1360. X  int dole_out_tgc_accum_count = 0;
  1361. X  
  1362. + #ifdef SVR4
  1363. + ulong colors_current = 0x00003740;
  1364. + ulong colors_normal = 0x00003740;    /* */
  1365. + ulong colors_initial = 0x00003740;    /* */
  1366. + ulong colors_success = 0x00003740;    /* */
  1367. + ulong colors_alert = 0x00003740L;    /* */
  1368. + ulong colors_error = 0x00003140L;    /* */
  1369. + ulong colors_notify = 0x00003340L;    /* */
  1370. + #else
  1371. X  ulong colors_current = 0x04070A00L;
  1372. X  ulong colors_normal = 0x04070A00L;    /* default lt_green/black red/white */
  1373. X  ulong colors_initial = 0x04070A00L;    /* default initial colors */
  1374. ***************
  1375. *** 154,159 ****
  1376. --- 170,176 ----
  1377. X  ulong colors_alert = 0x0E000E00L;    /* yellow */
  1378. X  ulong colors_error = 0x04000400L;    /* red */
  1379. X  ulong colors_notify = 0x08000800L;    /* gray */
  1380. + #endif
  1381. X  
  1382. X  int use_colors = 0;        /* set by ttyinit, but default no */
  1383. X  int tty_not_char_special;
  1384. ***************
  1385. *** 228,244 ****
  1386. X  _setcolor(clrs)
  1387. X  ulong clrs;
  1388. X  {
  1389. X      if(!use_colors || tty_not_char_special)
  1390. X          return;
  1391. X  
  1392. X      /* normal */
  1393. X      ff(se,"\033[=%ldF\033[=%ldG",(clrs >> 8) & 0xFF,clrs & 0xFF);
  1394. X  
  1395. X      /* reverse */
  1396. X      ff(se,"\033[=%ldH\033[=%ldI",(clrs >> 24) & 0xFF,(clrs >> 16) & 0xFF);
  1397. ! 
  1398. X      colors_current = clrs;
  1399. - 
  1400. X  }    /* end of _setcolor */
  1401. X  
  1402. X  /*+-------------------------------------------------------------------------
  1403. --- 245,269 ----
  1404. X  _setcolor(clrs)
  1405. X  ulong clrs;
  1406. X  {
  1407. +     char fg[4], bg[4];
  1408. + 
  1409. X      if(!use_colors || tty_not_char_special)
  1410. X          return;
  1411. X  
  1412. + #ifdef SVR4
  1413. X      /* normal */
  1414. +     sprintf(fg,"%s", (clrs >> 8) & 0xFF);
  1415. +     sprintf(bg,"%s", clrs & 0xFF);
  1416. +     ff(se,"\033[%sm", fg);
  1417. +     ff(se,"\033[%sm", bg);
  1418. + #else
  1419. +     /* normal */
  1420. X      ff(se,"\033[=%ldF\033[=%ldG",(clrs >> 8) & 0xFF,clrs & 0xFF);
  1421. X  
  1422. X      /* reverse */
  1423. X      ff(se,"\033[=%ldH\033[=%ldI",(clrs >> 24) & 0xFF,(clrs >> 16) & 0xFF);
  1424. ! #endif
  1425. X      colors_current = clrs;
  1426. X  }    /* end of _setcolor */
  1427. X  
  1428. X  /*+-------------------------------------------------------------------------
  1429. ***************
  1430. *** 266,272 ****
  1431. X      }
  1432. X      _setcolor(new_colors);
  1433. X      tcap_stand_end();
  1434. - 
  1435. X  }    /* end of setcolor */
  1436. X  
  1437. X  /*+-------------------------------------------------------------------------
  1438. --- 291,296 ----
  1439. ***************
  1440. *** 549,554 ****
  1441. --- 573,579 ----
  1442. X       * (I ain't proud of this beyond being a valiant attempt)
  1443. X       */
  1444. X      use_colors = 0;
  1445. + #if defined(M_SYSV) || defined(ISC)
  1446. X      if( ((itmp = ioctl(TTYIN,CONS_GET,&monitor_type)) >= 0) &&
  1447. X          (use_colors = (monitor_type != MONO)))
  1448. X      {
  1449. ***************
  1450. *** 556,561 ****
  1451. --- 581,587 ----
  1452. X          setcolor(colors_normal);
  1453. X      }
  1454. X      tty_is_multiscreen = !(itmp < 0);
  1455. + #endif
  1456. X  
  1457. X      /*
  1458. X       * save initial tty state
  1459. ***************
  1460. *** 624,631 ****
  1461. X      0 restore attributes saved at start of execution
  1462. X      1 raw mode (send xon/xoff, but do not respond to it, no ISIG/SIGINT)
  1463. X      2 raw mode (same as 1 but allow keyboard interrupts)
  1464. !     3 attributes at start of execution, but with echo disabled and no parity
  1465. !     4 same as 2 but terminate program on SIGINT
  1466. X  
  1467. X  ------------------------------------------------------------------------*/
  1468. X  void
  1469. --- 650,656 ----
  1470. X      0 restore attributes saved at start of execution
  1471. X      1 raw mode (send xon/xoff, but do not respond to it, no ISIG/SIGINT)
  1472. X      2 raw mode (same as 1 but allow keyboard interrupts)
  1473. !     3 same as 2 but terminate program on SIGINT
  1474. X  
  1475. X  ------------------------------------------------------------------------*/
  1476. X  void
  1477. ***************
  1478. *** 648,654 ****
  1479. X  
  1480. X      case 1:
  1481. X      case 2:
  1482. !     case 4:
  1483. X          tty_termio_current = tty_termio_at_entry;
  1484. X  
  1485. X          tty_termio_current.c_cflag &= ~(PARENB | PARODD);
  1486. --- 673,679 ----
  1487. X  
  1488. X      case 1:
  1489. X      case 2:
  1490. !     case 3:
  1491. X          tty_termio_current = tty_termio_at_entry;
  1492. X  
  1493. X          tty_termio_current.c_cflag &= ~(PARENB | PARODD);
  1494. ***************
  1495. *** 673,688 ****
  1496. X          current_ttymode = arg;
  1497. X          break;
  1498. X  
  1499. -     case 3:
  1500. -         tty_termio_current = tty_termio_at_entry;
  1501. -         tty_termio_current.c_cflag &= ~(PARENB | PARODD);
  1502. -         tty_termio_current.c_cflag |= CS8;
  1503. -         tty_termio_current.c_iflag &= ~(ISTRIP);
  1504. -         tty_termio_current.c_lflag &= ~(ICANON | ISIG | ECHO);
  1505. -         ioctl(TTYIN,TCSETAW,(char *)&tty_termio_current);
  1506. -         current_ttymode = 3;
  1507. -         break;
  1508. - 
  1509. X      default:
  1510. X          ff(se,"\r\nttymode: invalid argument %d\r\n",arg);
  1511. X          break;
  1512. --- 698,703 ----
  1513. ***************
  1514. *** 751,756 ****
  1515. --- 766,780 ----
  1516. X  }    /* end of ttyflush */
  1517. X  
  1518. X  /*+-------------------------------------------------------------------------
  1519. +     ttyrdchk() - see if key pressed and not read
  1520. + --------------------------------------------------------------------------*/
  1521. + int
  1522. + ttyrdchk()
  1523. + {
  1524. +     return(rdchk(TTYIN) || dole_out_tgc_accum_count);
  1525. + }    /* end of ttyrdchk */
  1526. + 
  1527. + /*+-------------------------------------------------------------------------
  1528. X      ttygetc(xkey_ok) -- get a key from the keyboard
  1529. X  if UNIX or XENIX, map extended keys to sign-bit-set special value
  1530. X  if xkey_ok is 0, disallow extended keys
  1531. ***************
  1532. *** 777,782 ****
  1533. --- 801,808 ----
  1534. X      {
  1535. X          ctmp = *dole_out_tgc_accum++;
  1536. X          dole_out_tgc_accum_count--;
  1537. +         if(kbd_is_7bit)
  1538. +             ctmp &= 0x7F;
  1539. X          return((uint)ctmp);
  1540. X      }
  1541. X  
  1542. ***************
  1543. *** 790,799 ****
  1544. X          termecu(TERMECU_TTYIN_READ_ERROR);
  1545. X      }
  1546. X  
  1547. !     if(kbd_is_7bit)
  1548. !         ctmp &= 0x7F;
  1549. ! 
  1550. !     if(tty_is_ansi && (ctmp == ESC))    /* if escape from ansi terminal */
  1551. X      {
  1552. X          itmp = 0;
  1553. X          timeout_remaining = tty_escape_timeout;
  1554. --- 816,823 ----
  1555. X          termecu(TERMECU_TTYIN_READ_ERROR);
  1556. X      }
  1557. X  
  1558. !     /* if escape from SCO/"ansi" terminal */
  1559. !     if(tty_is_ansi && ((ctmp & 0x7F) == ESC))
  1560. X      {
  1561. X          itmp = 0;
  1562. X          timeout_remaining = tty_escape_timeout;
  1563. ***************
  1564. *** 811,825 ****
  1565. X              if(!rdchk(TTYIN))
  1566. X                  continue;
  1567. X              read(TTYIN,(char *)&ctmp,1);
  1568. -             if(kbd_is_7bit)
  1569. -                 ctmp &= 0x7F;
  1570. -             if(itmp == (sizeof(tgc_accum) - 1))    /* do not allow overflow */
  1571. -                 break;
  1572. X              tgc_accum[itmp++] = ctmp;
  1573. X              if(itmp == 2)
  1574. X                  break;
  1575. X          }
  1576. X          tgc_accum[itmp] = 0;
  1577. X          if(!itmp)                /* no subsequent chars, so ... */
  1578. X              return(ESC);        /* return the escape */
  1579. X          else if((itmp == 2) && (tgc_accum[0] == '['))
  1580. --- 835,852 ----
  1581. X              if(!rdchk(TTYIN))
  1582. X                  continue;
  1583. X              read(TTYIN,(char *)&ctmp,1);
  1584. X              tgc_accum[itmp++] = ctmp;
  1585. X              if(itmp == 2)
  1586. X                  break;
  1587. X          }
  1588. X          tgc_accum[itmp] = 0;
  1589. +         if(kbd_test_active)
  1590. +         {
  1591. +             char title[32];
  1592. +             sprintf(title,"--> func key '%s' (%d key codes received)",
  1593. +                 kde_text(ctmp),itmp);
  1594. +             hex_dump(tgc_accum,-itmp,title,1);
  1595. +         }
  1596. X          if(!itmp)                /* no subsequent chars, so ... */
  1597. X              return(ESC);        /* return the escape */
  1598. X          else if((itmp == 2) && (tgc_accum[0] == '['))
  1599. ***************
  1600. *** 835,841 ****
  1601. X                  case XF7: case XF8: case XF9: case XF10: case XF11: case XF12:
  1602. X                  case XFbktab:
  1603. X                      if(xkey_ok)
  1604. !                         return(tgc_accum[1] | 0x80);
  1605. X                      /* fall thru -- xkey not allowed */
  1606. X                  default:
  1607. X                      ring_bell();
  1608. --- 862,868 ----
  1609. X                  case XF7: case XF8: case XF9: case XF10: case XF11: case XF12:
  1610. X                  case XFbktab:
  1611. X                      if(xkey_ok)
  1612. !                         return((uint)tgc_accum[1] | 0x80);
  1613. X                      /* fall thru -- xkey not allowed */
  1614. X                  default:
  1615. X                      ring_bell();
  1616. ***************
  1617. *** 844,854 ****
  1618. X              /*NOTREACHED*/
  1619. X          }
  1620. X          /* not func key -- must be typamatic control key */
  1621. X          dole_out_tgc_accum_count = itmp - 1;
  1622. X          dole_out_tgc_accum = tgc_accum + 1;
  1623. X          return((uint)tgc_accum[0]);
  1624. X      }
  1625. !     else if(!tty_is_ansi && (ctmp >= 0x01) && (ctmp <= 0x1F) &&
  1626. X              (ctmp != kbderase) && (ctmp != kbdkill) &&
  1627. X              (ctmp != kbdeol) && (ctmp != kbdeol2) &&
  1628. X              (ctmp != kbdintr) && (ctmp != kbdeof) )
  1629. --- 871,895 ----
  1630. X              /*NOTREACHED*/
  1631. X          }
  1632. X          /* not func key -- must be typamatic control key */
  1633. +         if(kbd_test_active)
  1634. +         {
  1635. +             char title[32];
  1636. +             if(itmp > 1)
  1637. +             {
  1638. +                 sprintf(title,
  1639. +                     "--> no func key recognized (%d key codes received)",itmp);
  1640. +                 hex_dump(tgc_accum,-itmp,title,1);
  1641. +             }
  1642. +         }
  1643. X          dole_out_tgc_accum_count = itmp - 1;
  1644. X          dole_out_tgc_accum = tgc_accum + 1;
  1645. +         if(kbd_is_7bit)
  1646. +             tgc_accum[0] &= 0x7F;
  1647. X          return((uint)tgc_accum[0]);
  1648. X      }
  1649. !     else if(!tty_is_ansi &&            /* this is getting crazy */
  1650. !             ((ctmp >= 0x01) && (ctmp <= 0x1F) ||
  1651. !              (ctmp >= 0x81) && (ctmp <= 0x9F)) &&
  1652. X              (ctmp != kbderase) && (ctmp != kbdkill) &&
  1653. X              (ctmp != kbdeol) && (ctmp != kbdeol2) &&
  1654. X              (ctmp != kbdintr) && (ctmp != kbdeof) )
  1655. ***************
  1656. *** 870,887 ****
  1657. X              if(!rdchk(TTYIN))
  1658. X                  continue;
  1659. X              read(TTYIN,(char *)&ctmp,1);
  1660. -             timeout_remaining = tty_escape_timeout;
  1661. -             if(kbd_is_7bit)
  1662. -                 ctmp &= 0x7F;
  1663. X              if(itmp == (sizeof(tgc_accum) - 1))    /* do not allow overflow */
  1664. X                  break;
  1665. X              tgc_accum[itmp++] = ctmp;
  1666. X          }
  1667. X          tgc_accum[itmp] = 0;
  1668. X          if((ctmp == XF_not_yet) && (itmp == 1))
  1669. !             return(tgc_accum[0]);
  1670. X          else if(ctmp < XF_no_way)    /* if we got a map */
  1671. X          {
  1672. X              if(!xkey_ok)
  1673. X              {
  1674. X                  ring_bell();
  1675. --- 911,940 ----
  1676. X              if(!rdchk(TTYIN))
  1677. X                  continue;
  1678. X              read(TTYIN,(char *)&ctmp,1);
  1679. X              if(itmp == (sizeof(tgc_accum) - 1))    /* do not allow overflow */
  1680. +             {
  1681. +                 ctmp = XF_no_way;
  1682. X                  break;
  1683. +             }
  1684. +             timeout_remaining = tty_escape_timeout;
  1685. X              tgc_accum[itmp++] = ctmp;
  1686. X          }
  1687. X          tgc_accum[itmp] = 0;
  1688. X          if((ctmp == XF_not_yet) && (itmp == 1))
  1689. !         {
  1690. !             if(kbd_is_7bit)
  1691. !                 tgc_accum[0] &= 0x7F;
  1692. !             return((uint)tgc_accum[0]);
  1693. !         }
  1694. X          else if(ctmp < XF_no_way)    /* if we got a map */
  1695. X          {
  1696. +             if(kbd_test_active)
  1697. +             {
  1698. +                 char title[32];
  1699. +                 sprintf(title,"--> func key '%s' (%d key codes received)",
  1700. +                     kde_text(ctmp),itmp);
  1701. +                 hex_dump(tgc_accum,-itmp,title,1);
  1702. +             }
  1703. X              if(!xkey_ok)
  1704. X              {
  1705. X                  ring_bell();
  1706. ***************
  1707. *** 893,908 ****
  1708. X                      screen_dump(screen_dump_file_name);
  1709. X                      goto GET_KEY;
  1710. X                  default:
  1711. !                     return(KDEk_to_XF[ctmp]);
  1712. X              }
  1713. X              /*NOTREACHED*/
  1714. X          }
  1715. X          /* not func key -- must be typamatic control key */
  1716. X          dole_out_tgc_accum_count = itmp - 1;
  1717. X          dole_out_tgc_accum = tgc_accum + 1;
  1718. X          return((uint)tgc_accum[0]);
  1719. X      }
  1720. !     return(ctmp);
  1721. X  }    /* end if ttygetc */
  1722. X  
  1723. X  /*+-----------------------------------------------------------------------
  1724. --- 946,979 ----
  1725. X                      screen_dump(screen_dump_file_name);
  1726. X                      goto GET_KEY;
  1727. X                  default:
  1728. !                     return((uint)KDEk_to_XF[ctmp]);
  1729. X              }
  1730. X              /*NOTREACHED*/
  1731. X          }
  1732. X          /* not func key -- must be typamatic control key */
  1733. +         if(kbd_test_active)
  1734. +         {
  1735. +             char title[32];
  1736. +             if(itmp > 1)
  1737. +             {
  1738. +                 sprintf(title,
  1739. +                     "--> no func key recognized (%d key codes received)",itmp);
  1740. +                 hex_dump(tgc_accum,-itmp,title,1);
  1741. +             }
  1742. +         }
  1743. X          dole_out_tgc_accum_count = itmp - 1;
  1744. X          dole_out_tgc_accum = tgc_accum + 1;
  1745. +         if(kbd_is_7bit)
  1746. +             tgc_accum[0] &= 0x7F;
  1747. X          return((uint)tgc_accum[0]);
  1748. X      }
  1749. ! 
  1750. !     /*
  1751. !      * simple key, not special
  1752. !      */
  1753. !     if(kbd_is_7bit)
  1754. !         ctmp &= 0x7F;
  1755. !     return((uint)ctmp);
  1756. X  }    /* end if ttygetc */
  1757. X  
  1758. X  /*+-----------------------------------------------------------------------
  1759. ***************
  1760. *** 1080,1086 ****
  1761. X                          ring_bell();
  1762. X                          continue;
  1763. X                      }
  1764. !                     str[strcount++] = inch & 0x7F;
  1765. X                      strpos++;
  1766. X                      fputc(inch,se);
  1767. X                  }
  1768. --- 1151,1157 ----
  1769. X                          ring_bell();
  1770. X                          continue;
  1771. X                      }
  1772. !                     str[strcount++] = inch;
  1773. X                      strpos++;
  1774. X                      fputc(inch,se);
  1775. X                  }
  1776. ***************
  1777. *** 1172,1177 ****
  1778. --- 1243,1286 ----
  1779. X      return(0);
  1780. X  
  1781. X  }    /* end of ttygets_esd */
  1782. + 
  1783. + /*+-------------------------------------------------------------------------
  1784. +     kbd_test() - test keyboard handler
  1785. + --------------------------------------------------------------------------*/
  1786. + void
  1787. + kbd_test()
  1788. + {
  1789. + uint ctmp = 0;
  1790. + 
  1791. +     pputs("Press keys to test (ESCape to exit)\n");
  1792. +     kbd_test_active = 1;
  1793. +     while(ctmp != ESC)
  1794. +     {
  1795. +         ctmp = ttygetc(1);
  1796. +         
  1797. +         if((ctmp < 0x80) && dole_out_tgc_accum_count)
  1798. +         {
  1799. +             pprintf("    got %d key sequence %s ",
  1800. +                 dole_out_tgc_accum_count,hex_to_ascii_name(ctmp));
  1801. +             while(dole_out_tgc_accum_count)
  1802. +             {
  1803. +                 pprintf("%s ",hex_to_ascii_name(*dole_out_tgc_accum++));
  1804. +                 dole_out_tgc_accum_count--;
  1805. +             }
  1806. +             pputs("\n");
  1807. +             ctmp = 0;
  1808. +             continue;
  1809. +         }
  1810. +         pputs("    got ");
  1811. +         if(ctmp >= 0x80)
  1812. +             pprintf("fkey '%s'\n",xf_text(ctmp));
  1813. +         else
  1814. +             pprintf("key  '%s'\n",hex_to_ascii_name(ctmp));
  1815. +     }
  1816. +     kbd_test_active = 0;
  1817. +     pputs("keyboard test complete\n\n");
  1818. +     
  1819. + }    /* end of kbd_test */
  1820. X  
  1821. X  /*+-------------------------------------------------------------------------
  1822. X      char *get_ttyname() - return pointer to static string
  1823. Common subdirectories: /export/home/wht/src/ecu312/ecuungetty and ./ecuungetty
  1824. diff -c /export/home/wht/src/ecu312/ecuutil.c ./ecuutil.c
  1825. *** /export/home/wht/src/ecu312/ecuutil.c    Sun Aug 25 17:29:22 1991
  1826. --- ./ecuutil.c    Sun Aug 25 16:05:22 1991
  1827. ***************
  1828. *** 33,38 ****
  1829. --- 33,40 ----
  1830. X  
  1831. X  ------------------------------------------------------------------------*/
  1832. X  /*+:EDITS:*/
  1833. + /*:08-25-1991-14:39-wht@n4hgf-SVR4 port thanks to aega84!lh */
  1834. + /*:08-17-1991-14:11-root@n4hgf-ascii_to_hex supports "csi" */
  1835. X  /*:08-13-1991-13:53-wht@n4hgf-UNIX and ISC nap() broken; XENIX still wins */
  1836. X  /*:07-25-1991-12:57-wht@n4hgf-ECU release 3.10 */
  1837. X  /*:04-16-1991-15:45-wht@n4hgf-gcc cannot use memmove */
  1838. ***************
  1839. *** 49,54 ****
  1840. --- 51,84 ----
  1841. X  #include "ecukey.h"
  1842. X  #include <pwd.h>
  1843. X  
  1844. + #if defined(sun)
  1845. + #undef ECHO
  1846. + #undef NL0
  1847. + #undef NL1
  1848. + #undef TAB0
  1849. + #undef TAB1
  1850. + #undef TAB2
  1851. + #undef XTABS
  1852. + #undef CR0
  1853. + #undef CR1
  1854. + #undef CR2
  1855. + #undef CR3
  1856. + #undef FF0
  1857. + #undef FF1
  1858. + #undef BS0
  1859. + #undef BS1
  1860. + #undef TOSTOP
  1861. + #undef FLUSHO
  1862. + #undef PENDIN
  1863. + #undef NOFLSH
  1864. + #include <sys/ioctl.h>
  1865. + #endif
  1866. + 
  1867. + #ifdef SVR4
  1868. + # include <sys/termiox.h>
  1869. + extern int hx_flag;
  1870. + #endif
  1871. + 
  1872. X  char *getenv();
  1873. X  
  1874. X  extern int errno;
  1875. ***************
  1876. *** 627,637 ****
  1877. X                  (flag & CREAD ) ? 1 : 0,
  1878. X                  (flag & HUPCL ) ? 1 : 0,
  1879. X                  (flag & CLOCAL) ? 1 : 0);
  1880. ! #if defined(RTSFLOW)    /* only SCO */
  1881. X      pprintf(" RTSFLOW:%d  CTSFLOW:%d",
  1882. X                  (flag & RTSFLOW ) ? 1 : 0,
  1883. X                  (flag & CTSFLOW ) ? 1 : 0);
  1884. X  #endif
  1885. X      pprintf("\n");
  1886. X  
  1887. X      flag = ttt->c_lflag;
  1888. --- 657,672 ----
  1889. X                  (flag & CREAD ) ? 1 : 0,
  1890. X                  (flag & HUPCL ) ? 1 : 0,
  1891. X                  (flag & CLOCAL) ? 1 : 0);
  1892. ! #if defined(RTSFLOW) || defined(SVR4)    /* only SCO and SVR4 */
  1893. X      pprintf(" RTSFLOW:%d  CTSFLOW:%d",
  1894. + #ifdef SVR4
  1895. +                 (hx_flag & RTSXOFF ) ? 1 : 0,
  1896. +                 (hx_flag & CTSXON ) ? 1 : 0);
  1897. + #else
  1898. X                  (flag & RTSFLOW ) ? 1 : 0,
  1899. X                  (flag & CTSFLOW ) ? 1 : 0);
  1900. X  #endif
  1901. + #endif
  1902. X      pprintf("\n");
  1903. X  
  1904. X      flag = ttt->c_lflag;
  1905. ***************
  1906. *** 720,725 ****
  1907. --- 755,761 ----
  1908. X      ascii_name_to_hex(str3char)
  1909. X  
  1910. X    return value of ascii ctl char name (e.g., "NUL") 0 - 0x1F
  1911. +   support CSI "ascii" 0x9B (for ESC + '[' ANSI)
  1912. X    returns -1 if input not valid
  1913. X  ------------------------------------------------------------------------*/
  1914. X  ascii_name_to_hex(str3char)
  1915. ***************
  1916. *** 728,735 ****
  1917. X  register char *cptr = ascii_ctlstr;
  1918. X  register intval;
  1919. X  
  1920. !     if(ulcmpb(str3char,"del") < 0)
  1921. !         return(127);
  1922. X  
  1923. X      for(intval = 0; intval <= SPACE; intval++)
  1924. X      {
  1925. --- 764,773 ----
  1926. X  register char *cptr = ascii_ctlstr;
  1927. X  register intval;
  1928. X  
  1929. !     if((strlen(str3char) == 3) && (ulcmpb(str3char,"del") < 0))
  1930. !         return(0x7F);
  1931. !     if((strlen(str3char) == 3) && (ulcmpb(str3char,"csi") < 0))
  1932. !         return(0x9B);
  1933. X  
  1934. X      for(intval = 0; intval <= SPACE; intval++)
  1935. X      {
  1936. ***************
  1937. *** 1041,1046 ****
  1938. --- 1079,1090 ----
  1939. X  Nap(msec)
  1940. X  long msec;
  1941. X  {
  1942. + #if defined(sun)
  1943. + struct timeval timer;
  1944. +     timer.tv_sec = 0;
  1945. +     timer.tv_usec = 1000L * msec;
  1946. +     select(0,0,0,0,&timer);
  1947. + #else
  1948. X  #if defined(M_XENIX) || defined(WORKING_UNIX_NAP)
  1949. X      return(nap(msec));
  1950. X  #else
  1951. ***************
  1952. *** 1049,1056 ****
  1953. X      if(nap(msec) < 0)
  1954. X          return(-1);
  1955. X      return(msec);
  1956. ! #endif
  1957. X  }    /* end of Nap */
  1958. X  
  1959. X  /* end of ecuutil.c */
  1960. X  /* vi: set tabstop=4 shiftwidth=4: */
  1961. --- 1093,1118 ----
  1962. X      if(nap(msec) < 0)
  1963. X          return(-1);
  1964. X      return(msec);
  1965. ! #endif /* defined(M_XENIX) || defined(WORKING_UNIX_NAP) */
  1966. ! #endif /* sun */
  1967. ! 
  1968. X  }    /* end of Nap */
  1969. + 
  1970. + /*+-------------------------------------------------------------------------
  1971. +     rdchk(fd) - for systems without it but with FIONREAD
  1972. + --------------------------------------------------------------------------*/
  1973. + #if defined(sun)
  1974. + int
  1975. + rdchk(fd)
  1976. + {
  1977. + int chars_waiting;
  1978. + 
  1979. +     if(ioctl(fd,FIONREAD,&chars_waiting))
  1980. +         return(0);
  1981. +     else
  1982. +         return(!!chars_waiting);
  1983. + }    /* end of rdchk */
  1984. + #endif
  1985. X  
  1986. X  /* end of ecuutil.c */
  1987. X  /* vi: set tabstop=4 shiftwidth=4: */
  1988. SHAR_EOF
  1989. true || echo 'restore of PATCH3.01 failed'
  1990. fi
  1991. echo 'End of ecu/patch part 2'
  1992. echo 'File PATCH3.01 is continued in part 3'
  1993. echo 3 > _shar_seq_.tmp
  1994. exit 0
  1995.  
  1996. exit 0 # Just in case...
  1997.