ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some missing slashes, and don't stupidly die on a config misparse

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11871 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-10-13 18:58:24 +00:00
parent 526a37bc7a
commit 99064f734b
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.inspircd.inc
View File

@ -303,7 +303,7 @@ sub getpidfile
# Are We using a relative path?
if ($file !~ /^\//) {
# Convert it to a full path.
$file = $runpath . $file;
$file = $runpath .'/'. $file;
}
# Have we checked this file before?
@ -311,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
@ -331,13 +331,10 @@ sub getpidfile
{
return;
}
else
elsif (-f "$runpath/$pidfile")
{
if (-f $runpath . $pidfile)
{
$pidfile = $runpath . $pidfile;
return;
}
$pidfile = "$runpath/$pidfile";
return;
}
return;
}
@ -352,18 +349,6 @@ 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 $runpath . $pidfile)
{
$pidfile = $runpath . $pidfile;
return;
}
}
if ($pidfile ne "") {
# Yes, Return.
return;