[Ltp-cvs] utils/analysis/lcov/bin gendesc, 1.14, 1.15 genhtml, 1.56, 1.57 geninfo, 1.90, 1.91 genpng, 1.16, 1.17 lcov, 1.79, 1.80

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

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

Modified Files:
	gendesc genhtml geninfo genpng lcov 
Log Message:
gendesc/genhtml/geninfo/genpng/lcov: handle '<' in filenames

Use 3-arg open mode to prevent that a special character (e.g. '<')
found in a user-specified filename interfers with the required open
mode for that file.


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** genpng	20 Aug 2010 13:14:50 -0000	1.16
--- genpng	19 Nov 2010 15:45:01 -0000	1.17
***************
*** 183,187 ****
  	my @source;
  
! 	open(HANDLE, "<$filename")
  		or die("ERROR: cannot open $filename!\n");
  
--- 183,187 ----
  	my @source;
  
! 	open(HANDLE, "<", $filename)
  		or die("ERROR: cannot open $filename!\n");
  
***************
*** 363,367 ****
  
  	# Write PNG file
! 	open (PNG_HANDLE, ">$filename")
  		or die("ERROR: cannot write png file $filename!\n");
  	binmode(*PNG_HANDLE);
--- 363,367 ----
  
  	# Write PNG file
! 	open (PNG_HANDLE, ">", $filename)
  		or die("ERROR: cannot write png file $filename!\n");
  	binmode(*PNG_HANDLE);

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** genhtml	24 Aug 2010 16:15:53 -0000	1.56
--- genhtml	19 Nov 2010 15:45:01 -0000	1.57
***************
*** 858,862 ****
  	if ($html_gzip)
  	{
! 		open($handle, "|gzip -c >$filename")
  			or die("ERROR: cannot open $filename for writing ".
  			       "(gzip)!\n");
--- 858,862 ----
  	if ($html_gzip)
  	{
! 		open($handle, "|-", "gzip -c >'$filename'")
  			or die("ERROR: cannot open $filename for writing ".
  			       "(gzip)!\n");
***************
*** 864,868 ****
  	else
  	{
! 		open($handle, ">$filename")
  			or die("ERROR: cannot open $filename for writing!\n");
  	}
--- 864,868 ----
  	else
  	{
! 		open($handle, ">", $filename)
  			or die("ERROR: cannot open $filename for writing!\n");
  	}
***************
*** 1308,1312 ****
  
  		# Open compressed file
! 		open(INFO_HANDLE, "gunzip -c $_[0]|")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
--- 1308,1312 ----
  
  		# Open compressed file
! 		open(INFO_HANDLE, "-|", "gunzip -c '$_[0]'")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
***************
*** 1315,1319 ****
  	{
  		# Open decompressed file
! 		open(INFO_HANDLE, $_[0])
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
--- 1315,1319 ----
  	{
  		# Open decompressed file
! 		open(INFO_HANDLE, "<", $_[0])
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
***************
*** 2287,2291 ****
  	local *TEST_HANDLE;
  
! 	open(TEST_HANDLE, "<".$_[0])
  		or die("ERROR: cannot open $_[0]!\n");
  
--- 2287,2291 ----
  	local *TEST_HANDLE;
  
! 	open(TEST_HANDLE, "<", $_[0])
  		or die("ERROR: cannot open $_[0]!\n");
  
***************
*** 2558,2562 ****
  	foreach (keys(%data))
  	{
! 		open(PNG_HANDLE, ">".$_)
  			or die("ERROR: cannot create $_!\n");
  		binmode(PNG_HANDLE);
--- 2558,2562 ----
  	foreach (keys(%data))
  	{
! 		open(PNG_HANDLE, ">", $_)
  			or die("ERROR: cannot create $_!\n");
  		binmode(PNG_HANDLE);
***************
*** 2576,2580 ****
  	my $htaccess_data;
  
! 	open(*HTACCESS_HANDLE, ">.htaccess")
  		or die("ERROR: cannot open .htaccess for writing!\n");
  
--- 2576,2580 ----
  	my $htaccess_data;
  
! 	open(*HTACCESS_HANDLE, ">", ".htaccess")
  		or die("ERROR: cannot open .htaccess for writing!\n");
  
***************
*** 2609,2613 ****
  	}
  
! 	open(CSS_HANDLE, ">gcov.css")
  		or die ("ERROR: cannot open gcov.css for writing!\n");
  
--- 2609,2613 ----
  	}
  
! 	open(CSS_HANDLE, ">", "gcov.css")
  		or die ("ERROR: cannot open gcov.css for writing!\n");
  
***************
*** 4992,4996 ****
  	}
  
! 	if (!open(SOURCE_HANDLE, "<".$source_filename)) {
  		my @lines;
  		my $last_line = 0;
--- 4992,4996 ----
  	}
  
! 	if (!open(SOURCE_HANDLE, "<", $source_filename)) {
  		my @lines;
  		my $last_line = 0;
***************
*** 5506,5515 ****
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">/dev/null");
! 	($mode & 2) && open(STDERR, ">/dev/null");
  
  	system(@_);
--- 5506,5515 ----
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&", "STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">", "/dev/null");
! 	($mode & 2) && open(STDERR, ">", "/dev/null");
  
  	system(@_);
***************
*** 5521,5526 ****
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&OLD_STDERR");
  
  	return $result;
--- 5521,5526 ----
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&", "OLD_STDERR");
  
  	return $result;
***************
*** 5543,5547 ****
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<$filename"))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");
--- 5543,5547 ----
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<", $filename))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");
***************
*** 5616,5620 ****
  		local *HANDLE;
  
! 		open(HANDLE, "<".$filename)
  			or die("ERROR: cannot open html prolog $filename!\n");
  		while (<HANDLE>)
--- 5616,5620 ----
  		local *HANDLE;
  
! 		open(HANDLE, "<", $filename)
  			or die("ERROR: cannot open html prolog $filename!\n");
  		while (<HANDLE>)
***************
*** 5662,5666 ****
  		local *HANDLE;
  
! 		open(HANDLE, "<".$filename)
  			or die("ERROR: cannot open html epilog $filename!\n");
  		while (<HANDLE>)
--- 5662,5666 ----
  		local *HANDLE;
  
! 		open(HANDLE, "<", $filename)
  			or die("ERROR: cannot open html epilog $filename!\n");
  		while (<HANDLE>)

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** lcov	24 Aug 2010 16:15:53 -0000	1.79
--- lcov	19 Nov 2010 15:45:01 -0000	1.80
***************
*** 644,648 ****
  		die("ERROR: no reset control found in $gcov_dir\n");
  	}
! 	open(HANDLE, ">$reset_file") or
  		die("ERROR: cannot write to $reset_file!\n");
  	print(HANDLE "0");
--- 644,648 ----
  		die("ERROR: no reset control found in $gcov_dir\n");
  	}
! 	open(HANDLE, ">", $reset_file) or
  		die("ERROR: cannot write to $reset_file!\n");
  	print(HANDLE "0");
***************
*** 666,673 ****
  	local *HANDLE;
  
! 	open(HANDLE, "<$from") or die("ERROR: cannot read $from: $!\n");
  	$content = <HANDLE>;
  	close(HANDLE);
! 	open(HANDLE, ">$to") or die("ERROR: cannot write $from: $!\n");
  	if (defined($content)) {
  		print(HANDLE $content);
--- 666,673 ----
  	local *HANDLE;
  
! 	open(HANDLE, "<", $from) or die("ERROR: cannot read $from: $!\n");
  	$content = <HANDLE>;
  	close(HANDLE);
! 	open(HANDLE, ">", $to) or die("ERROR: cannot write $from: $!\n");
  	if (defined($content)) {
  		print(HANDLE $content);
***************
*** 875,879 ****
  	local *HANDLE;
  
! 	open(HANDLE, "<$filename") || return undef;
  	$content = <HANDLE>;
  	close(HANDLE);
--- 875,879 ----
  	local *HANDLE;
  
! 	open(HANDLE, "<", $filename) || return undef;
  	$content = <HANDLE>;
  	close(HANDLE);
***************
*** 904,908 ****
  	$file = abs_path($file);
  	chdir($dir);
! 	open(HANDLE, "tar xvfz $file 2>/dev/null|")
  		or die("ERROR: could not process package $file\n");
  	while (<HANDLE>) {
--- 904,908 ----
  	$file = abs_path($file);
  	chdir($dir);
! 	open(HANDLE, "-|", "tar xvfz '$file' 2>/dev/null")
  		or die("ERROR: could not process package $file\n");
  	while (<HANDLE>) {
***************
*** 945,949 ****
  	local *HANDLE;
  
! 	open(HANDLE, ">$filename") || return 0;
  	print(HANDLE $content);
  	close(HANDLE) || return 0;
--- 945,949 ----
  	local *HANDLE;
  
! 	open(HANDLE, ">", $filename) || return 0;
  	print(HANDLE $content);
  	close(HANDLE) || return 0;
***************
*** 963,967 ****
  	my $count = 0;
  
! 	open(HANDLE, "tar tfz $filename|") or return undef;
  	while (<HANDLE>) {
  		if (/\.da$/ || /\.gcda$/) {
--- 963,967 ----
  	my $count = 0;
  
! 	open(HANDLE, "-|", "tar tfz '$filename'") or return undef;
  	while (<HANDLE>) {
  		if (/\.da$/ || /\.gcda$/) {
***************
*** 1617,1621 ****
  
  		# Open compressed file
! 		open(INFO_HANDLE, "gunzip -c $_[0]|")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
--- 1617,1621 ----
  
  		# Open compressed file
! 		open(INFO_HANDLE, "-|", "gunzip -c '$_[0]'")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
***************
*** 1624,1628 ****
  	{
  		# Open decompressed file
! 		open(INFO_HANDLE, $_[0])
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
--- 1624,1628 ----
  	{
  		# Open decompressed file
! 		open(INFO_HANDLE, "<", $_[0])
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
***************
*** 2480,2484 ****
  	{
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">$output_filename")
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $total_trace);
--- 2480,2484 ----
  	{
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">", $output_filename)
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $total_trace);
***************
*** 2710,2714 ****
  		info("Extracted $extracted files\n");
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">$output_filename")
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $data);
--- 2710,2714 ----
  		info("Extracted $extracted files\n");
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">", $output_filename)
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $data);
***************
*** 2766,2770 ****
  		info("Deleted $removed files\n");
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">$output_filename")
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $data);
--- 2766,2770 ----
  		info("Deleted $removed files\n");
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">", $output_filename)
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $data);
***************
*** 3294,3298 ****
  
  		# Open compressed file
! 		open(HANDLE, "gunzip -c $diff_file|")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
--- 3294,3298 ----
  
  		# Open compressed file
! 		open(HANDLE, "-|", "gunzip -c '$diff_file'")
  			or die("ERROR: cannot start gunzip to decompress ".
  			       "file $_[0]!\n");
***************
*** 3301,3305 ****
  	{
  		# Open decompressed file
! 		open(HANDLE, $diff_file)
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
--- 3301,3305 ----
  	{
  		# Open decompressed file
! 		open(HANDLE, "<", $diff_file)
  			or die("ERROR: cannot read file $_[0]!\n");
  	}
***************
*** 3927,3931 ****
  	{
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">$output_filename")
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $trace_data);
--- 3927,3931 ----
  	{
  		info("Writing data to $output_filename\n");
! 		open(INFO_HANDLE, ">", $output_filename)
  			or die("ERROR: cannot write to $output_filename!\n");
  		@result = write_info_file(*INFO_HANDLE, $trace_data);
***************
*** 4014,4023 ****
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">/dev/null");
! 	($mode & 2) && open(STDERR, ">/dev/null");
   
  	system(@_);
--- 4014,4023 ----
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&", "STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">", "/dev/null");
! 	($mode & 2) && open(STDERR, ">", "/dev/null");
   
  	system(@_);
***************
*** 4029,4034 ****
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&OLD_STDERR");
   
  	return $result;
--- 4029,4034 ----
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&", "OLD_STDERR");
   
  	return $result;
***************
*** 4051,4055 ****
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<$filename"))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");
--- 4051,4055 ----
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<", $filename))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");

Index: gendesc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/gendesc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gendesc	6 Aug 2010 11:25:12 -0000	1.14
--- gendesc	19 Nov 2010 15:45:01 -0000	1.15
***************
*** 154,158 ****
  	my $empty_line = "ignore";
  
! 	open(INPUT_HANDLE, $input_filename)
  		or die("ERROR: cannot open $input_filename!\n");
  
--- 154,158 ----
  	my $empty_line = "ignore";
  
! 	open(INPUT_HANDLE, "<", $input_filename)
  		or die("ERROR: cannot open $input_filename!\n");
  
***************
*** 160,164 ****
  	if ($output_filename)
  	{
! 		open(OUTPUT_HANDLE, ">$output_filename")
  			or die("ERROR: cannot create $output_filename!\n");
  	}
--- 160,164 ----
  	if ($output_filename)
  	{
! 		open(OUTPUT_HANDLE, ">", $output_filename)
  			or die("ERROR: cannot create $output_filename!\n");
  	}

Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** geninfo	19 Nov 2010 15:11:53 -0000	1.90
--- geninfo	19 Nov 2010 15:45:01 -0000	1.91
***************
*** 432,436 ****
  	# for each data file processed
  	local *DUMMY_HANDLE;
! 	open(DUMMY_HANDLE, ">$output_filename")
  		or die("ERROR: cannot create $output_filename!\n");
  	close(DUMMY_HANDLE);
--- 432,436 ----
  	# for each data file processed
  	local *DUMMY_HANDLE;
! 	open(DUMMY_HANDLE, ">", $output_filename)
  		or die("ERROR: cannot create $output_filename!\n");
  	close(DUMMY_HANDLE);
***************
*** 946,950 ****
  		{
  			# Append to output file
! 			open(INFO_HANDLE, ">>$output_filename")
  				or die("ERROR: cannot write to ".
  				       "$output_filename!\n");
--- 946,950 ----
  		{
  			# Append to output file
! 			open(INFO_HANDLE, ">>", $output_filename)
  				or die("ERROR: cannot write to ".
  				       "$output_filename!\n");
***************
*** 954,958 ****
  	{
  		# Open .info file for output
! 		open(INFO_HANDLE, ">$da_filename.info")
  			or die("ERROR: cannot create $da_filename.info!\n");
  	}
--- 954,958 ----
  	{
  		# Open .info file for output
! 		open(INFO_HANDLE, ">", "$da_filename.info")
  			or die("ERROR: cannot create $da_filename.info!\n");
  	}
***************
*** 1324,1328 ****
  
  		# Compare file contents
! 		open(SOURCE, $filename)
  			or die("ERROR: cannot read $filename!\n");
  
--- 1324,1328 ----
  
  		# Compare file contents
! 		open(SOURCE, "<", $filename)
  			or die("ERROR: cannot read $filename!\n");
  
***************
*** 1394,1398 ****
  	local *INPUT;
  
! 	if (!open(INPUT, $_[0]))
  	{
  		if ($ignore_errors[$ERROR_GCOV])
--- 1394,1398 ----
  	local *INPUT;
  
! 	if (!open(INPUT, "<", $_[0]))
  	{
  		if ($ignore_errors[$ERROR_GCOV])
***************
*** 1546,1550 ****
  	local *INPUT;
  
! 	if (!open(INPUT, $filename)) {
  		if ($ignore_errors[$ERROR_GCOV])
  		{
--- 1546,1550 ----
  	local *INPUT;
  
! 	if (!open(INPUT, "<", $filename)) {
  		if ($ignore_errors[$ERROR_GCOV])
  		{
***************
*** 1726,1730 ****
  	my $result;
  
! 	open(GCOV_PIPE, "$gcov_tool -v |")
  		or die("ERROR: cannot retrieve gcov version!\n");
  	$version_string = <GCOV_PIPE>;
--- 1726,1730 ----
  	my $result;
  
! 	open(GCOV_PIPE, "-|", "$gcov_tool -v")
  		or die("ERROR: cannot retrieve gcov version!\n");
  	$version_string = <GCOV_PIPE>;
***************
*** 1814,1823 ****
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">/dev/null");
! 	($mode & 2) && open(STDERR, ">/dev/null");
   
  	debug("system(".join(' ', @_).")\n");
--- 1814,1823 ----
  
  	# Save old stdout and stderr handles
! 	($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT");
! 	($mode & 2) && open(OLD_STDERR, ">>&", "STDERR");
  
  	# Redirect to /dev/null
! 	($mode & 1) && open(STDOUT, ">", "/dev/null");
! 	($mode & 2) && open(STDERR, ">", "/dev/null");
   
  	debug("system(".join(' ', @_).")\n");
***************
*** 1830,1835 ****
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&OLD_STDERR");
   
  	return $result;
--- 1830,1835 ----
  
  	# Restore old handles
! 	($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT");
! 	($mode & 2) && open(STDERR, ">>&", "OLD_STDERR");
   
  	return $result;
***************
*** 1852,1856 ****
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<$filename"))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");
--- 1852,1856 ----
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<", $filename))
  	{
  		warn("WARNING: cannot read configuration file $filename\n");
***************
*** 1924,1928 ****
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<$filename")) {
  		warn("WARNING: could not open $filename\n");
  		return undef;
--- 1924,1928 ----
  	local *HANDLE;
  
! 	if (!open(HANDLE, "<", $filename)) {
  		warn("WARNING: could not open $filename\n");
  		return undef;
***************
*** 2130,2134 ****
  		{
  			# Append to output file
! 			open(INFO_HANDLE, ">>$output_filename")
  				or die("ERROR: cannot write to ".
  				       "$output_filename!\n");
--- 2130,2134 ----
  		{
  			# Append to output file
! 			open(INFO_HANDLE, ">>", $output_filename)
  				or die("ERROR: cannot write to ".
  				       "$output_filename!\n");
***************
*** 2138,2142 ****
  	{
  		# Open .info file for output
! 		open(INFO_HANDLE, ">$graph_filename.info")
  			or die("ERROR: cannot create $graph_filename.info!\n");
  	}
--- 2138,2142 ----
  	{
  		# Open .info file for output
! 		open(INFO_HANDLE, ">", "$graph_filename.info")
  			or die("ERROR: cannot create $graph_filename.info!\n");
  	}
***************
*** 2602,2606 ****
  	local *HANDLE;
  
! 	open(HANDLE, "<$bb_filename") or goto open_error;
  	binmode(HANDLE);
  	while (!eof(HANDLE)) {
--- 2602,2606 ----
  	local *HANDLE;
  
! 	open(HANDLE, "<", $bb_filename) or goto open_error;
  	binmode(HANDLE);
  	while (!eof(HANDLE)) {
***************
*** 2779,2783 ****
  	local *HANDLE;
  
! 	open(HANDLE, "<$bbg_filename") or goto open_error;
  	binmode(HANDLE);
  	# Read magic
--- 2779,2783 ----
  	local *HANDLE;
  
! 	open(HANDLE, "<", $bbg_filename) or goto open_error;
  	binmode(HANDLE);
  	# Read magic
***************
*** 3013,3017 ****
  	local *HANDLE;
  
! 	open(HANDLE, "<$gcno_filename") or goto open_error;
  	binmode(HANDLE);
  	# Read magic
--- 3013,3017 ----
  	local *HANDLE;
  
! 	open(HANDLE, "<", $gcno_filename) or goto open_error;
  	binmode(HANDLE);
  	# Read magic