[Logcheck-commits] CVS logcheck/src

[CVS User maks-guest]

Update of /cvsroot/logcheck/logcheck/src
In directory haydn:/tmp/cvs-serv18624/src

Modified Files:
	logcheck logtail 
Log Message:

use strict for any perl script.
add some more consistency on how we use arguments in logtail:
added -f and -o switch.


--- /cvsroot/logcheck/logcheck/src/logcheck	2004/05/13 22:28:06	1.22
+++ /cvsroot/logcheck/logcheck/src/logcheck	2004/05/14 10:55:47	1.23
@@ -22,7 +22,7 @@
 # along with Logcheck; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# $Id: logcheck,v 1.22 2004/05/13 22:28:06 maks-guest Exp $
+# $Id: logcheck,v 1.23 2004/05/14 10:55:47 maks-guest Exp $
 
 
 # Set the umask
@@ -533,20 +533,20 @@
 		if [ -e $file.0 ]; then
 	        # assume the log is rotated by savelog(8)
 		    debug "Running logtail on rotated: $file.0"
-		    $LOGTAIL $file.0 $offsetfile $LOGTAIL_OPTS > \
+		    $LOGTAIL -f $file.0 -o $offsetfile $LOGTAIL_OPTS > \
 			$TMPDIR/logoutput/$(basename $file)
 		    rm -f $offsetfile
 		elif [ -e $file.1 ]; then
 		# assume the log is rotated by logrotate(8)
 		    debug "Running logtail on rotated: $file.1"
-		    $LOGTAIL $file.1 $offsetfile $LOGTAIL_OPTS > \
+		    $LOGTAIL -f $file.1 -o $offsetfile $LOGTAIL_OPTS > \
 			$TMPDIR/logoutput/$(basename $file)
 		    rm -f $offsetfile
 		fi
 	    fi
 	fi
 	debug "Running logtail: $file"
-	$LOGTAIL $file $offsetfile $LOGTAIL_OPTS \
+	$LOGTAIL -f $file -o $offsetfile $LOGTAIL_OPTS \
 	    >> $TMPDIR/logoutput/$(basename $file)
     else
 	echo "E: File could not be read: $file" >> $TMPDIR/errors
--- /cvsroot/logcheck/logcheck/src/logtail	2004/05/02 09:09:03	1.3
+++ /cvsroot/logcheck/logcheck/src/logtail	2004/05/14 10:55:47	1.4
@@ -19,17 +19,20 @@
 # along with Logcheck; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+use strict;
+my ($size);
 use Getopt::Std;
+my %opts = ();
 
 # process args and switches
 
 my ($TEST_MODE) = 0;
-getopt();
-if ($opt_t) {
+getopts("f:o:t", \%opts);
+if ($opts{t}) {
     $TEST_MODE = 1;
 }
 
-my ($logfile, $offsetfile) = @ARGV;
+my ($logfile, $offsetfile) = ($opts{f}, $opts{o});
 
 if (! -f $logfile) {
     print "File $logfile cannot be read.\n";
@@ -64,7 +67,6 @@
         }
     }
 
-    my ($size);
     unless ((undef,$ino,undef,undef,undef,undef,undef,$size) = stat $logfile) {
         print "Cannot get $logfile file size.\n", $logfile;
         exit 65;