Re: system/1617: vi.recover incorrectly builds emails

[Brian <cazz_(_at_)_wezl_(_dot_)_org>]

The following reply was made to PR system/1617; it has been noted by GNATS.

From: Brian <cazz_(_at_)_wezl_(_dot_)_org>
To: gnats_(_at_)_openbsd_(_dot_)_org
Cc: bmc_(_at_)_mitre_(_dot_)_org
Subject: Re: system/1617: vi.recover incorrectly builds emails
Date: Wed, 10 Jan 2001 19:41:40 -0500

 --zYM0uCDKw75PZbzx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 According to Brian:
 > 
 > >Number:         1617
 > >Category:       system
 > >Synopsis:       vi.recover incorrectly builds emails
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       medium
 > >Responsible:    bugs
 > >State:          open
 > >Class:          sw-bug
 > >Submitter-Id:   net
 > >Arrival-Date:   Wed Jan 10 17:30:01 MST 2001
 > >Last-Modified:
 > >Originator:     Brian Caswell
 > >Organization:
 > The MITRE Corporation
 > >Release:        1.6
 > >Environment:
 >         System      : OpenBSD 2.8
 >         Architecture: OpenBSD.i386
 >         Machine     : i386
 > >Description:
 >         vi.recover sends incorrect mail headers
 > >How-To-Repeat:
 >         edit as a file.  run vi.recover
 > >Fix:
 > 
 > Index: recover
 > ===================================================================
 > RCS file: /cvs/src/usr.bin/vi/build/recover,v
 > retrieving revision 1.6
 > diff -u -r1.6 recover
 > --- recover     2000/04/21 17:06:13     1.6
 > +++ recover     2001/01/11 00:05:46
 > 
FILE>;
 >         close(RECFILE);
 > -       @backups = grep(s/^X-vi-recover-path:\s*(.*)[\r\n]*$/$1/, @recfile);
 > -
 > +       @backups = grep(/^X-vi-recover-path:.*/, @recfile);
 > +       $backups[0] =~ s/(.*:\s)(.*)\n/$2/;
 > +
 >         #
 >         # Delete any recovery files that are zero length, corrupted,
 >         # or that have no corresponding backup file.  Else send mail
 > 
 > >Audit-Trail:
 > >Unformatted:
 
 
 arg.  cut and paste failed.
 
 the correct patch is attached.
 
 -brian
 
 --zYM0uCDKw75PZbzx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-recover
 
 Index: recover
 ===================================================================
 RCS file: /cvs/src/usr.bin/vi/build/recover,v
 retrieving revision 1.6
 diff -u -r1.6 recover
 --- recover	2000/04/21 17:06:13	1.6
 +++ recover	2001/01/11 00:05:46
 @@ -90,8 +90,9 @@
  	#
  	@recfile = <RECFILE>;
  	close(RECFILE);
 -	@backups = grep(s/^X-vi-recover-path:\s*(.*)[\r\n]*$/$1/, @recfile);
 -
 +	@backups = grep(/^X-vi-recover-path:.*/, @recfile);
 +	$backups[0] =~ s/(.*:\s)(.*)\n/$2/;
 +		
  	#
  	# Delete any recovery files that are zero length, corrupted,
  	# or that have no corresponding backup file.  Else send mail
 
 --zYM0uCDKw75PZbzx--