genhtml: fix handling of user-specified prefixes with trailing /

Peter Oberparleiter · oberpar · commit 29346542c30a · 2014-06-10T13:51:21.000+02:00
A trailing / in a user-specified prefix is not correctly recognized.
Fix this by removing any number of trailing / in a user-specified
prefix. Reported by ahmed_osman@mentor.com.
diff --git a/bin/genhtml b/bin/genhtml
@@ -73,7 +73,7 @@ use Digest::MD5 qw(md5_base64);
 
 # Global constants
 our $title		= "LCOV - code coverage report";
-our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.74 $)';
+our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.75 $)';
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -924,6 +924,7 @@ sub gen_html()
 	{
 		info("Using user-specified filename prefix \"".
 		     "$dir_prefix\"\n");
+		$dir_prefix =~ s/\/+$//;
 	}
 
 	# Read in test description file if specified

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ use Digest::MD5 qw(md5_base64);`
`73`	`73`
`74`	`74`	`# Global constants`
`75`	`75`	`our $title = "LCOV - code coverage report";`
`76`		`-our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.74 $)';`
	`76`	`+our $lcov_version = 'LCOV version 1.11 pre (CVS $Revision: 1.75 $)';`
`77`	`77`	`our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php";`
`78`	`78`	`our $tool_name = basename($0);`
`79`	`79`
`@@ -924,6 +924,7 @@ sub gen_html()`
`924`	`924`	`{`
`925`	`925`	`info("Using user-specified filename prefix \"".`
`926`	`926`	`"$dir_prefix\"\n");`
	`927`	`+ $dir_prefix =~ s/\/+$//;`
`927`	`928`	`}`
`928`	`929`
`929`	`930`	`# Read in test description file if specified`