Remove now-unused quitmsg/operquitmsg fields from User

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

diff --git a/.inspircd.inc b/.inspircd.inc
index fa4985a64181e68e6254a0b7dc0b034dbbab7c20..6181d66ec523852caae5b293998076d020d805fc 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.
@@ -201,8 +201,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 +209,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 +250,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;
@@ -312,10 +316,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 +341,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;