More CoreExport.

[user/henk/code/inspircd.git] / .inspircd.inc

diff --git a/.inspircd.inc b/.inspircd.inc
index e7a32b5f9d272370f3bf2b1b437112d530ccce06..91a06ccfd6430f849f13abb93f05fcd5eb749851 100644 (file)
--- 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,6 @@ use Fcntl;
 my $basepath   =       "@BASE_DIR@";
 my $confpath   =       "@CONFIG_DIR@/";
 my $binpath    =       "@BINARY_DIR@";
-my $libpath    =       "@LIBRARY_DIR@";
 my $valgrindlogpath    =       "$basepath/valgrindlogs";
 my $executable =       "@EXECUTABLE@";
 my $version    =       "@VERSION@";
@@ -26,7 +25,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 +34,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:
@@ -201,8 +205,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 +213,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";
        }
 }
@@ -246,7 +254,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;
@@ -257,7 +265,7 @@ sub cmd_stop()
        }
        print "InspIRCd not dying quietly -- forcing kill\n";
        kill KILL => $pid;
-       exit 0;
+       return 0;
 }
 
 ###
@@ -312,10 +320,23 @@ sub getpidfile
                {
                        # Set the PID file and return.
                        $pidfile = $1;
+                       if (-f $pidfile)
+                       {
+                               return;
+                       }
+                       else
+                       {
+                               if (-f $confpath . $pidfile)
+                               {
+                                       $pidfile = $confpath . $pidfile;
+                                       return;
+                               }
+                       }
                        return;
                }
        }
 
+
        # If we get here, NO PID FILE! -- Check for includes
        for my $i (@lines) {
                $i =~ s/[^=]+=\s(.*)/\1/;
@@ -324,6 +345,18 @@ sub getpidfile
                        # Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
                        getpidfile($1);
                        # Was a PID found?
+                       if (-f $pidfile)
+                       {
+                               return;
+                       }
+                       else
+                       {
+                               if (-f $confpath . $pidfile)
+                               {
+                                       $pidfile = $confpath . $pidfile;
+                                       return;
+                               }
+                       }
                        if ($pidfile ne "") {
                                # Yes, Return.
                                return;