--- loncom/lond 2005/06/27 22:32:37 1.289 +++ loncom/lond 2005/07/12 21:29:58 1.291 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.289 2005/06/27 22:32:37 albertel Exp $ +# $Id: lond,v 1.291 2005/07/12 21:29:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,7 +58,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.289 $'; #' stupid emacs +my $VERSION='$Revision: 1.291 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -1367,8 +1367,8 @@ sub du_handler { # assurance double sure, # use execute_command to ensure that the command is not executed in # a shell that can screw us up. - - my $duout = execute_command("du -ks $ududir"); + my $file_list = execute_command("find $ududir -not -regex '.*\.[0-9]+\.[^\.]+' -not -name '*.meta' -print"); + my $duout = execute_command("du -ks $file_list"); $duout=~s/[^\d]//g; #preserve only the numbers &Reply($client,"$duout\n","$cmd:$ududir"); } else { @@ -1413,7 +1413,8 @@ sub ls_handler { if(-d $ulsdir) { if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { - undef $obs, $rights; + undef($obs); + undef($rights); my @ulsstats=stat($ulsdir.'/'.$ulsfn); #We do some obsolete checking here if(-e $ulsdir.'/'.$ulsfn.".meta") { @@ -1480,7 +1481,8 @@ sub ls2_handler { if(-d $ulsdir) { if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { - undef $obs, $rights; + undef($obs); + undef($rights); my @ulsstats=stat($ulsdir.'/'.$ulsfn); #We do some obsolete checking here if(-e $ulsdir.'/'.$ulsfn.".meta") {