From: eldy <>
Date: Tue, 10 Dec 2002 22:31:29 +0000 (+0000)
Subject: Fixed: Pb with #include
X-Git-Tag: AWSTATS_5_3_BETA~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8db37f4e03a4db8a4ead2b5ec8930d210f9210d2;p=thirdparty%2FAWStats.git

Fixed: Pb with #include
---

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 32b112ee..b36a6b63 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -959,7 +959,7 @@ sub Read_Config {
 	$FileConfig=$FileSuffix='';
 	foreach my $dir (@PossibleConfigDir) {
 		my $searchdir=$dir;
-		if ($searchdir && (!($searchdir =~ /\/$/)) && (!($searchdir =~ /\\$/)) ) { $searchdir .= "/"; }
+		if ($searchdir && $searchdir !~ /[\\\/]$/) { $searchdir .= "/"; }
 		if (open(CONFIG,"$searchdir$PROG.$SiteConfig.conf")) 	{ $FileConfig="$searchdir$PROG.$SiteConfig.conf"; $FileSuffix=".$SiteConfig"; last; }
 		if (open(CONFIG,"$searchdir$PROG.conf"))  				{ $FileConfig="$searchdir$PROG.conf"; $FileSuffix=''; last; }
 	}
@@ -1018,11 +1018,9 @@ sub Parse_Config {
 		if ($_ =~ /^#include "([^\"]+)"/) {
 		    my $includeFile = $1;
 			if ($Debug) { debug("Found an include : $includeFile",2); }
-		    # Correct relative include files
-		    if ( $includeFile !~ m|^[\\/]| ) {
-				my $configDir = $FileConfig;
-				if ($configDir =~ s|[\\/][^\\/]*$|/|) {   $includeFile = "$configDir$includeFile"; }
-				else { $includeFile = "$includeFile"; }
+		    if ( $includeFile !~ /^[\\\/]/ ) {
+			    # Correct relative include files
+				if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; }
 			}
 		    if ( open( CONFIG_INCLUDE, $includeFile ) ) {
 				&Parse_Config( *CONFIG_INCLUDE , $level+1, $includeFile);