X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=b7f8e8f4fc9e78a15f43b928c6aad5b900081c27;hb=cf33b1fa05b8e3489232a4e57f0ba2542b0e7a64;hp=f2ba37454457b2573fc6088be8fa3e0388cf6a2f;hpb=82de56e409a19a05761794c9588713160b51144e;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index f2ba3745..b7f8e8f4 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -10,7 +10,6 @@
 package DXCommandmode;
 
 use POSIX;
-use IO::File;
 
 @ISA = qw(DXChannel);
 
@@ -27,14 +26,16 @@ use CmdAlias;
 use Filter;
 use Carp;
 use Minimuf;
+use DXDb;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
 $errstr = ();					# error string from eval
 %aliases = ();					# aliases for (parts of) commands
+$scriptbase = "$main::root/scripts"; # the place where all users start scripts go
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -195,7 +196,7 @@ sub run_cmd
 		dbg('eval', "stored func cmd = $c\n");
 		eval  $c;
 		if ($@) {
-			return (1, "Syserr: Eval err $errstr on stored func $self->{func}");
+			return ("Syserr: Eval err $errstr on stored func $self->{func}", $@);
 		}
 	} else {
 
@@ -232,31 +233,25 @@ sub run_cmd
 				
 				if ($package) {
 					dbg('command', "package: $package");
-					
-					my $c = qq{ \@ans = $package(\$self, \$args) };
-					dbg('eval', "cluster cmd = $c\n");
-					eval  $c;
-					if ($@) {
-						@ans = (0, "Syserr: Eval err cached $package\n$@");
+					my $c;
+					unless (exists $Cache{$package}->{sub}) {
+						$c = eval $Cache{$package}->{eval};
+						if ($@) {
+							return ("Syserr: Syntax error in $package", $@);
+						}
+						$Cache{$package}->{sub} = $c;
 					}
+					$c = $Cache{$package}->{sub};
+					@ans = &{$c}($self, $args);
 				}
 			} else {
 				dbg('command', "cmd: $cmd not found");
-				@ans = (0);
+				return ($self->msg('e1'));
 			}
 		}
 	}
 	
-	if ($ans[0]) {
-		shift @ans;
-	} else {
-		shift @ans;
-		if (@ans > 0) {
-			unshift @ans, $self->msg('e2');
-		} else {
-			@ans = $self->msg('e1');
-		}
-	}
+	shift @ans;
 	return (@ans);
 }
 
@@ -353,6 +348,14 @@ sub get_all
 	return @out;
 }
 
+# run a script for this user
+sub run_script
+{
+	my $self = shift;
+	my $silent = shift || 0;
+	
+}
+
 #
 # search for the command in the cache of short->long form commands
 #
@@ -443,22 +446,7 @@ sub valid_package_name {
 	
 	#Dress it up as a real package name
 	$string =~ s/\//_/og;
-	return "Emb_" . $string;
-}
-
-#borrowed from Safe.pm
-sub delete_package {
-	my $pkg = shift;
-	my ($stem, $leaf);
-	
-	no strict 'refs';
-	$pkg = "DXCommandmode::$pkg\::"; # expand to full symbol table name
-	($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
-	
-	if ($stem && $leaf) {
-		my $stem_symtab = *{$stem}{HASH};
-		delete $stem_symtab->{$leaf};
-	}
+	return $string;
 }
 
 # find a cmd reference
@@ -502,25 +490,21 @@ sub find_cmd_name {
 		return undef;
 	}
 	
-	if(defined $Cache{$package}{mtime} && $Cache{$package}{mtime } <= $mtime) {
+	if(defined $Cache{$package}->{mtime} &&$Cache{$package}->{mtime} <= $mtime) {
 		#we have compiled this subroutine already,
 		#it has not been updated on disk, nothing left to do
 		#print STDERR "already compiled $package->handler\n";
 		;
 	} else {
-		delete_package($package) if defined $Cache{$package}{mtime};
-		
-		my $fh = new IO::File;
-		if (!open $fh, $filename) {
+
+		my $sub = readfilestr($filename);
+		unless ($sub) {
 			$errstr = "Syserr: can't open '$filename' $!";
 			return undef;
 		};
-		local $/ = undef;
-		my $sub = <$fh>;
-		close $fh;
 		
 		#wrap the code into a subroutine inside our unique package
-		my $eval = qq{ sub $package { $sub } };
+		my $eval = qq( sub { $sub } );
 		
 		if (isdbg('eval')) {
 			my @list = split /\n/, $eval;
@@ -530,25 +514,9 @@ sub find_cmd_name {
 			}
 		}
 		
-		{
-			#hide our variables within this block
-			my($filename,$mtime,$package,$sub);
-			eval $eval;
-		}
-		
-		if ($@) {
-			print "\$\@ = $@";
-			$errstr = $@;
-			delete_package($package);
-		} else {
-			#cache it unless we're cleaning out each time
-			$Cache{$package}{'mtime'} = $mtime;
-		}
+		$Cache{$package} = {mtime => $mtime, eval => $eval };
 	}
-	
-	#print Devel::Symdump->rnew($package)->as_string, $/;
-	$package = "DXCommandmode::$package" if $package;
-	$package = undef if $errstr;
+
 	return $package;
 }