send-email: Fix Pine address book parsing
See: http://www.washington.edu/pine/tech-notes/low-level.html Entries with a fcc or comment field after the address weren't parsed correctly. Continuation lines, identified by leading spaces, were also not handled. Distribution lists which had ( ) around a list of addresses did not have the parenthesis removed. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
		
				
					committed by
					
						
						Junio C Hamano
					
				
			
			
				
	
			
			
			
						parent
						
							f20706220b
						
					
				
				
					commit
					73c427eb99
				
			@ -345,10 +345,13 @@ my %parse_alias = (
 | 
			
		||||
			# spaces delimit multiple addresses
 | 
			
		||||
			$aliases{$1} = [ split(/\s+/, $2) ];
 | 
			
		||||
		}}},
 | 
			
		||||
	pine => sub { my $fh = shift; while (<$fh>) {
 | 
			
		||||
		if (/^(\S+)\t.*\t(.*)$/) {
 | 
			
		||||
	pine => sub { my $fh = shift; my $f='\t[^\t]*';
 | 
			
		||||
	        for (my $x = ''; defined($x); $x = $_) {
 | 
			
		||||
			chomp $x;
 | 
			
		||||
		        $x .= $1 while(defined($_ = <$fh>) && /^ +(.*)$/);
 | 
			
		||||
			$x =~ /^(\S+)$f\t\(?([^\t]+?)\)?(:?$f){0,2}$/ or next;
 | 
			
		||||
			$aliases{$1} = [ split(/\s*,\s*/, $2) ];
 | 
			
		||||
		}}},
 | 
			
		||||
		}},
 | 
			
		||||
	gnus => sub { my $fh = shift; while (<$fh>) {
 | 
			
		||||
		if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) {
 | 
			
		||||
			$aliases{$1} = [ $2 ];
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user