# | Inspire Internet Relay Chat Daemon |
# +------------------------------------+
#
-# InspIRCd: (C) 2002-2008 InspIRCd Development Team
+# InspIRCd: (C) 2002-2009 InspIRCd Development Team
# See: http://www.inspircd.org/wiki/index.php/Credits
#
# This program is free but copyrighted software; see
#
# ---------------------------------------------------
#
+use strict;
use POSIX;
+use Fcntl;
my $basepath = "@BASE_DIR@";
my $confpath = "@CONFIG_DIR@/";
my $executable = "@EXECUTABLE@";
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";
sub cmd_help()
{
- @subs = grep { $_ =~ m/^(cmd|dev)_/ && defined(main->can($_)) } keys(%::);
+ my @subs = grep { $_ =~ m/^(cmd|dev)_/ && defined(main->can($_)) } keys(%::);
my @cmds = grep /^cmd_/, @subs;
my @devs = grep /^dev_/, @subs;
local $_;
checkgdb();
# If we are still alive here.. Try starting the IRCd..
- exec {gdb} 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(-nofork -debug), @_;
+ exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(-nofork -debug), @_;
die "Failed to start GDB: $!\n";
}
# If we are still alive here.. Try starting the IRCd..
print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
- exec {screen} qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+ exec qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(-nofork -debug -nolog), @_;
die "Failed to start screen: $!\n";
}
# 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.
- exec {valgrind} qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+ exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
die "Failed to start valgrind: $!\n";
}
my $pid = fork;
if ($pid == 0) {
POSIX::setsid();
- use Fcntl;
-d $valgrindlogpath or mkdir $valgrindlogpath or die "Cannot create $valgrindlogpath: $!\n";
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 {valgrind} qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+ exec qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
die "Can't execute valgrind: $!\n";
}
}
# If we are still alive here.. Try starting the IRCd..
print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
- exec {screen} qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+ exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
die "Failed to start screen: $!\n";
}
kill TERM => $pid or die "Cannot terminate IRCd: $!\n";
for (1..$maxwait) {
sleep 1;
- if (getstatus() == 1) {
+ if (getstatus() == 0) {
print "InspIRCd Stopped.\n";
return;
}
# defined, but defined in a comment (line starts with #)
# -- Brain
+my %filesparsed;
+
sub getpidfile
{
my ($file) = @_;
}
# Have we checked this file before?
- for (my $i = 0; $i < $filesparsed; $i++) {
- if ($filesparsed[$i] eq $file) {
- # Already Parsed, Possible recursive loop..
- return;
- }
- }
-
- # If we get here, Mark as 'Read'
- $filesparsed[$filesparsed] = $file;
+ return if $filesparsed{$file};
+ $filesparsed{$file} = 1;
# Open the File..
- open INFILE, "< $file" or die "Unable to open file $file\n";
+ open INFILE, "< $file" or die "Unable to open file $file included in configuration\n";
# Grab entire file contents..
my(@lines) = <INFILE>;
# Close the file
# remove trailing spaces
chomp(@lines);
- foreach $i (@lines) {
+ for my $i (@lines) {
# clean it up
$i =~ s/[^=]+=\s(.*)/\1/;
# Does this file have a pid?
}
# If we get here, NO PID FILE! -- Check for includes
- foreach $i (@lines) {
+ for my $i (@lines) {
$i =~ s/[^=]+=\s(.*)/\1/;
if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
{
sub getprocessid {
my $pid;
open PIDFILE, "< $pidfile" or return 0;
+ while(<PIDFILE>)
{
- $pid = $i;
+ $pid = $_;
}
close PIDFILE;
return $pid;
exit 0;
}
+my %filechecked;
+
sub validateconf
{
my ($file) = @_;
}
# Have we checked this file before?
- for (my $i = 0; $i < $filechecked; $i++) {
- if ($filechecked[$i] eq $file) {
- # Already Parsed, Possible recursive loop..
- return;
- }
- }
-
- # If we get here, Mark as 'Read'
- $filechecked[$filechecked] = $file;
+ return if $filechecked{$file};
+ $filechecked{$file} = 1;
# Open the File..
open INFILE, "< $file" or die "Unable to open file $file\n";
# push @newlines, "<!DOCTYPE config SYSTEM \"".$confpath."inspircd.dtd\">";
push @newlines, "<config>";
- foreach $i (@lines)
+ for my $i (@lines)
{
# remove trailing newlines
chomp($i);
$tmpfile = tmpnam();
} until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
- foreach $n (@newlines)
+ for my $n (@newlines)
{
print TF "$n\n";
}
chomp(@result);
my $skip = 0;
- foreach $n (@result)
+ for my $n (@result)
{
if ($skip)
{
projects / user / henk / code / inspircd.git / blobdiff