Fixed off-by-one error in client read() (improbable due to size of buffer but fixed...

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

diff --git a/.inspircd.inc b/.inspircd.inc
index e86ad18d482fc067b9bb44375f540e7c357dac0f..5900ce9c6f77b50e9c7c265718941cf3d79cdecb 100644 (file)
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -18,7 +18,7 @@
 $ENV{"LD_LIBRARY_PATH"} = $ENV{"LD_LIBRARY_PATH"} . ":/usr/local/lib/mysql:/usr/lib/mysql";
 
 my $conffile = "@CONFIG_DIR@/inspircd.conf";
-my $binpath = "@BINARY_DIR@/inspircd";
+my $binpath = "@BINARY_DIR@";
 
 # Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
 my $arg = $ARGV[0];
@@ -82,11 +82,11 @@ sub start {
         # Check to see its not 'running' already.
         if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
         # If we are still alive here.. Try starting the IRCd..
-        system($binpath);
+        system("$binpath/inspircd");
         sleep 1;
         if (getstatus() == 0) {
                 print "InspIRCd Seemingly not started, Log follows:\n";
-                system("tail ircd.log");
+                system("tail $binpath/ircd.log");
         } else {
                 # We're good!
                 return 1;
@@ -97,20 +97,12 @@ sub debug {
         # Check to see its not 'running' already.
         if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
         # If we are still alive here.. Try starting the IRCd..
-        system("gdb --args $binpath -nofork -debug");
-        sleep 1;
-        if (getstatus() == 0) {
-                print "InspIRCd Seemingly not started, Log follows:\n";
-                system("tail ircd.log");
-        } else {
-                # We're good!
-                return 1;
-        }
+        system("gdb --args $binpath/inspircd -nofork -debug");
 }
 
 
 sub stop {
-        if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)"; return 0; }
+        if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
         # Get to here, we have something to kill.
         my $pid = getprocessid();
        print "Stopping InspIRCd...\n";
@@ -126,7 +118,7 @@ sub stop {
 
 
 sub getpidfile {
-       open INFILE, "<  $conffile" or die "Couldn't open $conffile";
+       open INFILE, "<  $conffile" or die "Couldn't open $conffile\n";
        my(@lines) = <INFILE>;
        close INFILE;
        chomp(@lines);