[alt.sources] ecu patch 2 - corrected

wht@tridom.uucp (Warren Tucker) (10/19/89)

This is a corrected patch 2 for ecu.  If you have already applied the
original patch, apply this one too, but answer 'n' to all the questions
the patch program asks.  If you have not yet applied patch 2, throw the
old one away.

This is ecu unet1 patch 2, which will result in ecu revision 'unet1.01'.

I've had reports that:
1.  trying to add an entry to an empty telephone directory
resulted in a core dump.
2.  displaying the phrase list when empty caused extraneous
output (a list header by itself) after the 'empty list' message.

>>> TO APPLY PATCH:
1. unshar the shell archive
2. enter the command: './apply.patch.02'

------- cut here ---------
#!/bin/sh
# shar:	Shell Archiver  (v1.22)
#
#	Run the following text with /bin/sh to create:
#	  apply.patch.02
#	  ecu.p2.01
#	  ecu.p2.02
#	  ecu.p2.03
#	  ecunumrev.c
#
echo "x - extracting apply.patch.02 (Text)"
sed 's/^X//' << 'SHAR_EOF' > apply.patch.02 &&
X#apply.patch.02
X#this file applies ecu unet1 patch two
X#the original 48-part posting, should have been unshared
X#ecu patch 1 must have been applied
Xpatch ecuphone.c < ecu.p2.01 
Xrm ecuphone.c.orig
Xpatch ecuphrase.c < ecu.p2.02 
Xrm ecuphrase.c.orig
Xpatch ecusighdl.c < ecu.p2.03 
Xrm ecusighdl.c.orig
SHAR_EOF
chmod 0644 apply.patch.02 || echo "restore of apply.patch.02 fails"
echo "x - extracting ecu.p2.01 (Text)"
sed 's/^X//' << 'SHAR_EOF' > ecu.p2.01 &&
X*** ecuphone.c	Sun Oct 15 18:11:25 1989
X--- /u1/src/ecu/ecuphone.c	Sun Oct 15 17:02:45 1989
X***************
X*** 1,4
X! /* CHK=0x0280 */
X  /*+-------------------------------------------------------------------------
X  	ecuphone.c -- visual phone dialer/directory editor
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X
X--- 1,4 -----
X! /* CHK=0xDFE3 */
X  /*+-------------------------------------------------------------------------
X  	ecuphone.c -- visual phone dialer/directory editor
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X***************
X*** 47,52
X  
X  --------------------------------------------------------------------------*/
X  /*+:EDITS:*/
X  /*:08-31-1989-12:37-wht-was not always setting brate/parity properly */
X  /*:07-03-1989-22:57-wht------------- ecu 2.00 ---------------- */
X  /*:06-24-1989-16:53-wht-flush edits --- ecu 1.95 */
X
X--- 47,53 -----
X  
X  --------------------------------------------------------------------------*/
X  /*+:EDITS:*/
X+ /*:10-15-1989-16:52-wht-fix bug on adding to empty directory */
X  /*:08-31-1989-12:37-wht-was not always setting brate/parity properly */
X  /*:07-03-1989-22:57-wht------------- ecu 2.00 ---------------- */
X  /*:06-24-1989-16:53-wht-flush edits --- ecu 1.95 */
X***************
X*** 173,178
X  	if(pde_list_head == (PDE *)0)
X  	{
X  		pde_list_head = this;
X  		this->next = (PDE *)0;
X  		pde_list_quan++;
X  		return;
X
X--- 174,180 -----
X  	if(pde_list_head == (PDE *)0)
X  	{
X  		pde_list_head = this;
X+ 		this->prev = (PDE *)0;
X  		this->next = (PDE *)0;
X  		pde_list_quan++;
X  		return;
X***************
X*** 357,363
X  char readpde_buf[128];
X  char s80[80];
X  FILE *fp_phone;
X! PDE		*tpde;
X  char *str_token();
X  char *malloc();
X  
X
X--- 359,365 -----
X  char readpde_buf[128];
X  char s80[80];
X  FILE *fp_phone;
X! PDE	 *tpde;
X  char *str_token();
X  char *malloc();
X  
X***************
X*** 619,624
X  
X  	if(!tpde)
X  	{
X  		wclear(scrw);
X  		wrefresh(scrw);
X  		return;
X
X--- 621,628 -----
X  
X  	if(!tpde)
X  	{
X+ 		scrw_fill(tpde,curr_pde_line);
X+ /*
X  		wclear(scrw);
X  		wrefresh(scrw);
X  */
X***************
X*** 621,626
X  	{
X  		wclear(scrw);
X  		wrefresh(scrw);
X  		return;
X  	}
X  	for(itmp = 0; itmp < line_num; itmp++)
X
X--- 625,631 -----
X  /*
X  		wclear(scrw);
X  		wrefresh(scrw);
X+ */
X  		return;
X  	}
X  	for(itmp = 0; itmp < line_num; itmp++)
SHAR_EOF
chmod 0644 ecu.p2.01 || echo "restore of ecu.p2.01 fails"
echo "x - extracting ecu.p2.02 (Text)"
sed 's/^X//' << 'SHAR_EOF' > ecu.p2.02 &&
X*** ecuphrase.c	Sun Oct 15 18:11:26 1989
X--- /u1/src/ecu/ecuphrase.c	Sun Oct 15 17:53:06 1989
X***************
X*** 1,4
X! /* CHK=0x29B5 */
X  /*+-----------------------------------------------------------------
X  	ecuphrases.c
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X
X--- 1,4 -----
X! /* CHK=0xE146 */
X  /*+-----------------------------------------------------------------
X  	ecuphrases.c
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X***************
X*** 10,15
X  
X  ------------------------------------------------------------------------*/
X  /*+:EDITS:*/
X  /*:07-03-1989-22:57-wht------------- ecu 2.00 ---------------- */
X  /*:06-24-1989-16:53-wht-flush edits --- ecu 1.95 */
X  
X
X--- 10,16 -----
X  
X  ------------------------------------------------------------------------*/
X  /*+:EDITS:*/
X+ /*:10-15-1989-17:23-wht-dont show empty phrase list */
X  /*:07-03-1989-22:57-wht------------- ecu 2.00 ---------------- */
X  /*:06-24-1989-16:53-wht-flush edits --- ecu 1.95 */
X  
X***************
X*** 134,139
X  	{
X  		ff(se,"\r\n");
X  		read_phrases();
X  		stand_out();
X  		ff(se,
X  " # |  mnemonic    |     phrase                                              ");
X
X--- 135,142 -----
X  	{
X  		ff(se,"\r\n");
X  		read_phrases();
X+ 		if(!phrases_count)
X+ 			return(0);
X  		stand_out();
X  		ff(se,
X  " # |  mnemonic    |     phrase                                              ");
SHAR_EOF
chmod 0644 ecu.p2.02 || echo "restore of ecu.p2.02 fails"
echo "x - extracting ecu.p2.03 (Text)"
sed 's/^X//' << 'SHAR_EOF' > ecu.p2.03 &&
X*** /u4/ecu-unet1/release/ecusighdl.c	Sun Oct 15 18:33:03 1989
X--- ecusighdl.c	Sun Oct 15 18:39:07 1989
X***************
X*** 1,4
X! /* CHK=0xFBB9 */
X  /*+-----------------------------------------------------------------------
X  	ecusighdl.c - xmtr/rcvr individual process signal handlers
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X
X--- 1,4 -----
X! /* CHK=0x58F3 */
X  /*+-----------------------------------------------------------------------
X  	ecusighdl.c - xmtr/rcvr individual process signal handlers
X  	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X***************
X*** 187,193
X  		{
X  		char s64[64];
X  			sprintf(s64,"## RCVR process error %d, errno = %d",sig,save_errno);
X! 			setcolor(0x04070400); /* fgnd: red on blk, bgnd: red on wht */
X  			pputs(s64);
X  			pputs("\n");
X  			ecu_log_event(s64);
X
X--- 187,193 -----
X  		{
X  		char s64[64];
X  			sprintf(s64,"## RCVR process error %d, errno = %d",sig,save_errno);
X! 			setcolor(0x04070400L); /* fgnd: red on blk, bgnd: red on wht */
X  			pputs(s64);
X  			pputs("\n");
X  			ecu_log_event(s64);
SHAR_EOF
chmod 0644 ecu.p2.03 || echo "restore of ecu.p2.03 fails"
echo "x - extracting ecunumrev.c (Text)"
sed 's/^X//' << 'SHAR_EOF' > ecunumrev.c &&
X/* CHK=0x223A */
X/*+-----------------------------------------------------------------------
X	ecunumrev.c
X	Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X------------------------------------------------------------------------*/
X/*+:EDITS:*/
X/*:07-03-1989-22:57-wht------------- ecu 2.00 ---------------- */
X/*:06-24-1989-16:53-wht-flush edits --- ecu 1.95 */
X
Xchar *numeric_revision = "unet1.01";
X
X/* vi: set tabstop=4 shiftwidth=4: */
SHAR_EOF
chmod 0644 ecunumrev.c || echo "restore of ecunumrev.c fails"
exit 0

-- 
-------------------------------------------------------------------
Warren Tucker, Tridom Corporation       ...!gatech!emory!tridom!wht 
Ker-au'-lo-phon.  An 8-foot partial flue-stop, having metal pipes
surmounted by adjustable rings, and with a hole bored near the top
of each pipe, producing a soft and "reedy" tone.