more mojo->master return path fixes

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 916f3f7501a73c632d7b78a833e03460e6255fdd..f85e235d7d726ece77cb50c36dbd98733549e48f 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -14,6 +14,9 @@
 # 
 
 require 5.004;
+package main;
+
+use vars qw($data);
 
 # search local then perl directories
 BEGIN {
@@ -23,6 +26,8 @@ BEGIN {
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
+       $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+       $data = "$root/data";
 }
 
 use Msg;
@@ -54,7 +59,7 @@ $spos = $pos = $lth = 0;
 $inbuf = "";
 @time = ();
 
-$SIG{WINCH} = sub {@time = gettimeofday};
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -84,9 +89,9 @@ sub do_initscr
                init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
                init_pair(13, COLOR_YELLOW, COLOR_GREEN);
                init_pair(14, COLOR_RED, COLOR_GREEN);
-               eval { assume_default_colors($foreground, $background) };
+               eval { assume_default_colors($foreground, $background) } unless $is_win;
        }
-       
+
        $top = $scr->subwin($lines-4, $cols, 0, 0);
        $top->intrflush(0);
        $top->scrollok(1);
@@ -230,7 +235,7 @@ sub addtotop
                if ($inbuf =~ s/\x07+$//) {
                        beep();
                }
-               if (length $inbuf > $cols) {
+               if (length $inbuf >= $cols) {
                        $Text::Wrap::Columns = $cols;
                        push @shistory, wrap('',"\t", $inbuf);
                } else {