X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=a3df44eac7cd1bbe516db9aa4bc6bc5b806f9ccf;hb=8a13e4ebf7cb38008a87cd908d44161b216f5db9;hp=fa4985a64181e68e6254a0b7dc0b034dbbab7c20;hpb=da61548438b900ad78bff98b47b7dc2dd2a92611;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index fa4985a64..a3df44eac 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -4,7 +4,7 @@
 #       +------------------------------------+
 #
 #  InspIRCd: (C) 2002-2009 InspIRCd Development Team
-# See: http://www.inspircd.org/wiki/index.php/Credits
+# See: http://wiki.inspircd.org/Credits
 #
 # This program is free but copyrighted software; see
 #          the file COPYING for details.
@@ -18,7 +18,7 @@ use Fcntl;
 my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
-my $libpath	=	"@LIBRARY_DIR@";
+my $runpath	=	"@BASE_DIR@";
 my $valgrindlogpath	=	"$basepath/valgrindlogs";
 my $executable	=	"@EXECUTABLE@";
 my $version	=	"@VERSION@";
@@ -26,7 +26,7 @@ my $version	=	"@VERSION@";
 our($pid,$pidfile);
 # Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
 my $arg = shift(@ARGV);
-my $conf = $confpath . "inspircd.conf";
+my $conf;
 for my $a (@ARGV)
 {
 	if ($a =~ m/^--config=(.*)$/)
@@ -35,6 +35,11 @@ for my $a (@ARGV)
 		last;
 	}
 }
+if (!defined $conf) {
+	$conf = $confpath . "inspircd.conf";
+	push @ARGV, '--config='.$conf;
+}
+
 getpidfile($conf);
 
 # System for naming script command subs:
@@ -127,10 +132,11 @@ sub cmd_start(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 	# If we are still alive here.. Try starting the IRCd..
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
-	exec { "$binpath/$executable" } "$binpath/$executable", @_;
+	exec "$binpath/$executable", @_;
 	die "Failed to start IRCd: $!\n";
 }
 
@@ -139,6 +145,7 @@ sub dev_debug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
@@ -155,6 +162,7 @@ sub dev_screendebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 
 	#Check we have gdb
@@ -173,6 +181,7 @@ sub dev_valdebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
@@ -193,6 +202,7 @@ sub dev_valdebug_unattended(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
@@ -201,8 +211,6 @@ sub dev_valdebug_unattended(@)
 	checkgdb();
 
 	# If we are still alive here.. Try starting the IRCd..
-	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
-	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
 	#
 	# NOTE: Saving the debug log (redirected stdout), while useful, is a potential security risk AND one hell of a spacehog. DO NOT SAVE THIS WHERE EVERYONE HAS ACCESS!
 	# Redirect stdout to /dev/null if you're worried about the security.
@@ -211,11 +219,17 @@ sub dev_valdebug_unattended(@)
 	if ($pid == 0) {
 		POSIX::setsid();
 		-d $valgrindlogpath or mkdir $valgrindlogpath or die "Cannot create $valgrindlogpath: $!\n";
+		-e "$binpath/valgrind.sup" or do { open my $f, '>', "$binpath/valgrind.sup"; };
 		my $suffix = strftime("%Y%m%d-%H%M%S", localtime(time)) . ".$$";
 		open STDIN, '<', '/dev/null' or die "Can't redirect STDIN to /dev/null: $!\n";
 		sysopen STDOUT, "$valgrindlogpath/out.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0600 or die "Can't open $valgrindlogpath/out.$suffix: $!\n";
 		sysopen STDERR, "$valgrindlogpath/valdebug.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0666 or die "Can't open $valgrindlogpath/valdebug.$suffix: $!\n";
-		exec qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
+	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
+		exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
+			"--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
+			qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
+			"$binpath/$executable", qw(-nofork -debug -nolog), @_;
 		die "Can't execute valgrind: $!\n";
 	}
 }
@@ -225,6 +239,7 @@ sub dev_screenvaldebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
@@ -246,7 +261,7 @@ sub cmd_stop()
 	# Get to here, we have something to kill.
 	my $pid = getprocessid();
 	print "Stopping InspIRCd (pid: $pid)...\n";
-	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 30 : 5;
+	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 90 : 5;
 	kill TERM => $pid or die "Cannot terminate IRCd: $!\n";
 	for (1..$maxwait) {
 		sleep 1;
@@ -288,7 +303,7 @@ sub getpidfile
 	# Are We using a relative path?
 	if ($file !~ /^\//) {
 		# Convert it to a full path.
-		$file = $confpath . $file;
+		$file = $runpath .'/'. $file;
 	}
 
 	# Have we checked this file before?
@@ -296,7 +311,7 @@ sub getpidfile
 	$filesparsed{$file} = 1;
 
 	# Open the File..
-	open INFILE, "< $file" or die "Unable to open file $file included in configuration\n";
+	open INFILE, '<', $file or return;
 	# Grab entire file contents..
 	my(@lines) = <INFILE>;
 	# Close the file
@@ -312,10 +327,20 @@ sub getpidfile
 		{
 			# Set the PID file and return.
 			$pidfile = $1;
+			if (-f $pidfile)
+			{
+				return;
+			}
+			elsif (-f "$runpath/$pidfile")
+			{
+				$pidfile = "$runpath/$pidfile";
+				return;
+			}
 			return;
 		}
 	}
 
+
 	# If we get here, NO PID FILE! -- Check for includes
 	for my $i (@lines) {
 		$i =~ s/[^=]+=\s(.*)/\1/;
@@ -332,7 +357,7 @@ sub getpidfile
 	}
 
 	# End of includes / No includes found. Using default.
-	$pidfile = $confpath . "inspircd.pid";
+	$pidfile = $runpath . "/data/inspircd.pid";
 }
 
 sub getstatus {
@@ -402,7 +427,7 @@ sub validateconf
 	# Are We using a relative path?
 	if ($file !~ /^\//) {
 		# Convert it to a full path..
-		$file = $confpath . $file;
+		$file = $runpath . $file;
 	}
 
 	# Have we checked this file before?