X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=2ab02967f8d6dcdf5741af56f3d8525f1bfa1f4a;hb=0527b7c5dc1f7e87eb6de0f7f6ce2f2ec27dd11e;hp=12192891de1bba6939b8ade706e1feed6ca97940;hpb=dd902a3e23aeb207178d9960f17b757262842ed6;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 12192891..2ab02967 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -64,11 +64,11 @@ sub cread
 
 	dbg("DXCron::cread reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
-	while (<$fh>) {
+	while (my $l = <$fh>) {
 		$line++;
-		chomp;
-		next if /^\s*#/o or /^\s*$/o;
-		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
+		chomp $l;
+		next if $l =~ /^\s*#/o or $l =~ /^\s*$/o;
+		my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
 		next unless defined $min;
 		my $ref = bless {};
 		my $err = '';
@@ -82,18 +82,17 @@ sub cread
 			if (!$err) {
 				$ref->{cmd} = $cmd;
 				push @out, $ref;
-				dbg("DXCron::cread: adding $_\n") if isdbg('cron');
+				dbg("DXCron::cread: adding $l\n") if isdbg('cron');
 			} else {
 				$err =~ s/^, //;
-				LogDbg('cron', "DXCron::cread: error $err on line $line '$_'");
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$l'");
 			}
 		} else {
-			LogDbg('cron', "DXCron::cread error on line $line '$_'");
+			LogDbg('cron', "DXCron::cread error on line $line '$l'");
 			my @s = ($min, $hour, $mday, $month, $wday, $cmd);
 			my $s = "line $line splits as " . join(', ', (map {defined $_ ? qq{$_} : q{'undef'}} @s));
 			LogDbg('cron', $s);
 		}
-		
 	}
 	close($fh);
 	return @out;
@@ -330,7 +329,7 @@ sub run_cmd
 	my @in = $main::me->run_cmd($line);
 	dbg("DXCron::run_cmd: $line") if isdbg('cron');
 	for (@in) {
-		s/\s*$//og;
+		s/\s*$//;
 		dbg("DXCron::cmd out: $_") if isdbg('cron');
 	}
 }