Be consistent. Use ServerInstance in all places instead of 'Instance' in half. This...

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

diff --git a/.inspircd.inc b/.inspircd.inc
index b474f8438c1e37d398ea33af96590dcde9ebf8bc..f1c7ce07acd12a7854ee2f915f0d2131a69c6143 100644 (file)
--- 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:
-#                <brain@chatspike.net>
-#                <Craig@chatspike.net>
+#      (C) 2002-2008 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();
 
 ###
@@ -117,7 +115,7 @@ sub debug {
        checkgdb();
 
        # If we are still alive here.. Try starting the IRCd..
-       system("gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+       system("gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug");
 }
 
 sub screendebug
@@ -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/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
+               if (($incf =~ s/\<include file=\"(.+?)\"\>//i) && ($incf !~ /^#/))
                {
                        # yes, process it
                        validateconf($1);