1.1 --- a/l3-agent	Tue Dec 06 23:54:06 2005 +0200
     1.2 +++ b/l3-agent	Wed Dec 21 14:39:44 2005 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -#!/usr/bin/perl -w
     1.5 +#!/usr/bin/perl -w
     1.6  
     1.7  #
     1.8  # (c) Igor Chubin, imchubin@mail.ru, 2004-2005
     1.9 @@ -798,7 +798,7 @@
    1.10  		# Декабрь 2004 год; остальные -- 2005 год.
    1.11  
    1.12  		my $year = 2005;
    1.13 -		$year = 2004 if ( $cl->{day} > 330 );
    1.14 +		#$year = 2004 if ( $cl->{day} > 330 );
    1.15  		# timelocal(			$sec,	   $min,      $hour,      $mday,$mon,$year);
    1.16  		$cl->{time} = timelocal_nocheck($cl->{sec},$cl->{min},$cl->{hour},$cl->{day},0,$year);
    1.17  
    1.18 @@ -961,13 +961,19 @@
    1.19  		if (open(PIDFILE, $Config{agent_pidfile})) {
    1.20  			my $pid = <PIDFILE>;
    1.21  			close(PIDFILE);
    1.22 -			if ( ! -e "/proc/$pid" || !`grep $Config{"l3-agent"} /proc/$pid/cmdline && grep "uid:.*\b$<\b" /proc/$pid/status`) {
    1.23 +			if ($^O eq 'linux' && (! -e "/proc/$pid" || !`grep $Config{"l3-agent"} /proc/$pid/cmdline && grep "uid:.*\b$<\b" /proc/$pid/status`)) {
    1.24  				print "Removing stale pidfile\n";
    1.25  				unlink $Config{agent_pidfile}
    1.26  					or die "Can't remove stale pidfile ". $Config{agent_pidfile}. " : $!";
    1.27  			}
    1.28 +			elsif ($^O eq 'freebsd' && !`ps axo uid,pid,command | grep '$<.*$pid.*$Config{"l3-agent"}' 2> /dev/null`) {
    1.29 +			}
    1.30 +			elsif ($^O eq 'linux' || $^O eq 'freebsd' ) {
    1.31 +				print "l3-agent is already running\n";
    1.32 +				exit(0);
    1.33 +			}
    1.34  			else {
    1.35 -				print "l3-agent is already running\n";
    1.36 +				print "Unknown operating system";
    1.37  				exit(0);
    1.38  			}
    1.39  		}