[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.57,1.58

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1390

Modified Files:
	genhtml 
Log Message:
genhtml: handle special characters in file and directory names

HTML special characters (e.g. '<') found in file or directory names are
not correctly shown in HTML output. Fix this by correctly escaping such
characters.


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** genhtml	19 Nov 2010 15:45:01 -0000	1.57
--- genhtml	19 Nov 2010 16:00:22 -0000	1.58
***************
*** 3442,3451 ****
  	my $file_code;
  	my $entry;
  
  	# Add link to source if provided
  	if (defined($page_link) && $page_link ne "") {
! 		$file_code = "<a href=\"$page_link\">$filename</a>";
  	} else {
! 		$file_code = $filename;
  	}
  
--- 3442,3452 ----
  	my $file_code;
  	my $entry;
+ 	my $esc_filename = escape_html($filename);
  
  	# Add link to source if provided
  	if (defined($page_link) && $page_link ne "") {
! 		$file_code = "<a href=\"$page_link\">$esc_filename</a>";
  	} else {
! 		$file_code = $esc_filename;
  	}
  
***************
*** 4199,4202 ****
--- 4200,4204 ----
  	my $num_rows;
  	my $i;
+ 	my $esc_trunc_name = escape_html($trunc_name);
  
  	$base_name = basename($rel_filename);
***************
*** 4214,4218 ****
  		$base_dir = get_relative_base_path($rel_filename);
  		$view = "<a href=\"$base_dir"."index.$html_ext\">".
! 			"$overview_title</a> - $trunc_name";
  	}
  	elsif ($type == $HDR_SOURCE || $type == $HDR_FUNC)
--- 4216,4220 ----
  		$base_dir = get_relative_base_path($rel_filename);
  		$view = "<a href=\"$base_dir"."index.$html_ext\">".
! 			"$overview_title</a> - $esc_trunc_name";
  	}
  	elsif ($type == $HDR_SOURCE || $type == $HDR_FUNC)
***************
*** 4220,4223 ****
--- 4222,4227 ----
  		# File view
  		my $dir_name = dirname($rel_filename);
+ 		my $esc_base_name = escape_html($base_name);
+ 		my $esc_dir_name = escape_html($dir_name);
  
  		$base_dir = get_relative_base_path($dir_name);
***************
*** 4229,4233 ****
  				"target=\"_parent\">$overview_title</a> - ".
  				"<a href=\"index.$html_ext\" target=\"_parent\">".
! 				"$dir_name</a> - $base_name";
  		}
  		else
--- 4233,4237 ----
  				"target=\"_parent\">$overview_title</a> - ".
  				"<a href=\"index.$html_ext\" target=\"_parent\">".
! 				"$esc_dir_name</a> - $esc_base_name";
  		}
  		else
***************
*** 4236,4240 ****
  				"$overview_title</a> - ".
  				"<a href=\"index.$html_ext\">".
! 				"$dir_name</a> - $base_name";
  		}
  
--- 4240,4244 ----
  				"$overview_title</a> - ".
  				"<a href=\"index.$html_ext\">".
! 				"$esc_dir_name</a> - $esc_base_name";
  		}