fix console.pl max scroll depth

[spider.git] / cmd / help.pl

diff --git a/cmd/help.pl b/cmd/help.pl
index afdd2d302df66cc0d14db4c1dba93ba20b3eaf0d..cc9eee3a1cf3d32e58d3b090212c373b0614d619 100644 (file)
--- a/cmd/help.pl
+++ b/cmd/help.pl
@@ -7,69 +7,115 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
 my @out;
 
 # this is naff but it will work for now
-$line = "help" if !$line;
 my $lang = $self->lang;
 $lang = 'en' if !$lang;
 
 # each help file contains lines that looks like:-
 #
-# === 0^EN^*^Description
+# === 0^*^Description
 # text
 # text
 #
-# === 0^EN^help^Description
+# === 0^help^Description
 # text
 # text
 # text 
 #
-# The fields are:- privilege level, Language, full command name, short description
+# The fields are:- privilege level, full command name, short description
 #
 
-my $h = new IO::File;
+#$DB::single = 1;
+
 
-if (!open($h, "$main::localcmd/Commands_$lang.hlp")) {
-       if (!open($h, "$main::cmd/Commands_$lang.hlp")) {
+my $defh = new IO::File;
+unless ($defh->open("$main::localcmd/Commands_en.hlp")) {
+       unless($defh->open("$main::cmd/Commands_en.hlp")) {
                return (1, $self->msg('helpe1'));
        }
 }
+
+my $h;
+if ($lang ne 'en') {
+       $h = new IO::File;
+       unless ($h->open("$main::localcmd/Commands_$lang.hlp")) {
+               unless($h->open("$main::cmd/Commands_$lang.hlp")) {
+                       undef $h;
+               }
+       }
+}
+
 my $in;
 
-$line =~ s/![\w\/]//og;
-$line =~ s/\//\.\*\//og;
-$line =~ s/^\s+//og;
-$line =~ s/\s+$//og;
+#$line =~ s/[^\w\/]//g;
+#$line =~ s/\//\.\*\//g;
+
+$line =~ s{[^\w/]}{}g;
+$line =~ s{/}{.*/}g;
+$line =~ s/^\s+//g;
+$line =~ s/[\s\r]+$//g;
+$line = "help" if $line =~ /^\s*$/;
 
 # sort out aliases
 my $alias = CmdAlias::get_hlp($line);
 $line = $alias if $alias;
 
-my $include;
-foreach $in (<$h>) {
+# non english help (if available)
+if ($h) {
+       my $state = 0;
+       foreach $in (<$h>) {
+               next if $in =~ /^\#/;
+               chomp $in;
+               $in =~ s/\r$//;
+               if ($in =~ /^===/) {
+                       last if $state == 2;           # come out on next command
+                       $in =~ s/=== //;
+                       my ($priv, $cmd, $desc) = split /\^/, $in;
+                       next if $priv > $self->priv;             # ignore subcommands that are of no concern
+                       next unless $cmd =~ /^$line/i;
+                       push @out, "$cmd $desc" unless $cmd =~ /-$/o;
+                       $state = 1;
+                       next;
+               }
+               if ($state > 0) {
+                       push @out, " $in";
+                       $state = 2;
+               }
+       }
+       $h->close;
+
+       # return if some help was given, otherwise continue to english help
+       return (1, @out) if @out && $state == 2;
+}
+
+# standard 'english' help
+my $state = 0;
+foreach $in (<$defh>) {
        next if $in =~ /^\#/;
        chomp $in;
        if ($in =~ /^===/) {
-               $include = 0;
+               last if $state == 2;           # come out on next command
                $in =~ s/=== //;
                my ($priv, $cmd, $desc) = split /\^/, $in;
                next if $priv > $self->priv;             # ignore subcommands that are of no concern
-               next unless $cmd =~ /$line/i;
+               next unless $cmd =~ /^$line/i;
                push @out, "$cmd $desc" unless $cmd =~ /-$/o;
-               $include = 1;
+               $state = 1;
                next;
        }
-       push @out, "   $in" if $include;
+       if ($state > 0) {
+               push @out, " $in";
+               $state = 2;
+       }
 }
-
-close($h);
+$defh->close;
 
 push @out, $self->msg('helpe2', $line) if @out == 0;
-
 return (1, @out);