X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=183c11c7172a159e311591574cfff30aaf98bdc5;hb=e3df3b9d267cb3839db268ff6d0be389c45ebf6d;hp=b474f8438c1e37d398ea33af96590dcde9ebf8bc;hpb=f631009527f3e615416f693e3a95266832a101bd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.inspircd.inc b/.inspircd.inc index b474f8438..183c11c71 100644 --- a/.inspircd.inc +++ b/.inspircd.inc @@ -3,16 +3,13 @@ # | Inspire Internet Relay Chat Daemon | # +------------------------------------+ # -# Inspire is copyright (C) 2002-2004 ChatSpike-Dev. -# E-mail: -# -# +# (C) 2002-2007 InspIRCd Development Team +# http://www.inspircd.org/wiki/index.php/Credits # # Written by Craig Edwards, Craig McLure, and others. # This program is free but copyrighted software; see # the file COPYING for details. # -# I HATE PERL.. kthxbye # --------------------------------------------------- use POSIX; @@ -91,6 +88,7 @@ if ($arg eq "Cheese-Sandwich") { ### print "Invalid Argument: $arg\n"; print "Usage: inspircd (start|stop|restart|rehash|status|cron|checkconf|version)\n"; +print "Developer arguments: (debug|screendebug|valdebug|screenvaldebug)\n"; exit(); ### @@ -366,9 +364,6 @@ sub validateconf # remove trailing newlines chomp($i); - # clean up - $i =~ s/[^=]+=\s(.*)/\1/; - # convert tabs to spaces $i =~ s/\t/ /g; @@ -394,8 +389,12 @@ sub validateconf # remove trailing spaces $i =~ s/ *$//; + # setup incf for include check and clean it up, since this breaks parsing use local var + my $incf = $i; + $incf =~ s/[^=]+=\s(.*)/\1/; + # include file? - if (($i =~ s/\//i) && ($i !~ /^#/)) + if (($incf =~ s/\//i) && ($incf !~ /^#/)) { # yes, process it validateconf($1);