Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!utgpu!water!watmath!clyde!rutgers!ames!sdcsvax!ucbvax!hplabs!hplabsc!daemon
From: daemon@hplabsc.UUCP
Newsgroups: comp.mail.elm
Subject: Bugfix for ELM
Message-ID: <1952@hplabsc.HP.COM>
Date: Sat, 6-Jun-87 00:40:28 EDT
Article-I.D.: hplabsc.1952
Posted: Sat Jun  6 00:40:28 1987
Date-Received: Sun, 7-Jun-87 03:07:58 EDT
Sender: daemon@hplabsc.HP.COM
Reply-To: mcvax!askja!marius@seismo.CSS.GOV (Marius Olafsson)
Organization: University of Iceland
Lines: 48
Approved: taylor@hplabs (with 'postmail')


The following fixes two bugs in ELM 1.5:

	1. ~r command in the Berkely emulation (editor=none) includes
	    the wrong message if message ordering on display is different
	    from order in mailbox. (editmsg.c)

	2.  Even if USE_EMBEDDED_ADDRESS is defined, the address in the 
	    From: line is not used if ELM thinks the >From line is valid.
	    (return_addr.c)

The diffs are to 1.5 (I found 1.5b to be considerably slower and these
problems exist there too).


*** editmsg.ol
--- editmsg.c
***************
*** 376,377
  	register int lines = 0, add_prefix=0;
  

--- 376,378 -----
  	register int lines = 0, add_prefix=0;
+ 	int	mindex;
  
***************
*** 379,381
  
! 	sprintf(local_buffer, "%s %s", readmsg, ++buffer);
  

--- 380,383 -----
  
! 	mindex = atoi(++buffer);
! 	sprintf(local_buffer, "%s %d", readmsg, header_table[mindex-1].index_number);
  
*** return_addr.ol
--- return_addr.c
***************
*** 262,263
  	get_address_from("From:", buf, hold_return);
        }

--- 262,264 -----
  	get_address_from("From:", buf, hold_return);
+ 	buffer[0] = '\0';		/* Embedded address to overwrite */
        }