--- bin/CleanLog	2003/08/05 09:52:36	1.3
+++ bin/CleanLog	2003/08/05 21:10:28	1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # CleanLog
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,39 +6,52 @@
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-use lib "/usr/share/postgresql/contrib";
+BEGIN {
+	my $basedir = $0; $basedir =~ s#/[^/]+$##;
+	unshift(@INC, "$basedir/../share");
+}
 
+use strict;
 use Getopt::Long;
 use RServ;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
-    print "Usage: $PROGRAM_NAME --host=name --user=name --password=string masterdb syncid\n";
-    exit ((scalar(@ARGV) < 2)? 1: 0);
+my ($debug,$verbose) = (0,0);
+my ($help,$masterhost,$masterport,$masteruser,$masterpassword);
+my $snapshot = "__Snapshot";
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
+	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"snapshot=s" => \$snapshot,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
+    print "Usage: $0 [options] masterdb syncid
+Options:
+	--masterhost=hostname --masterport=port
+	--masteruser=username --masterpassword=string
+	--snapshot=snapshot
+";
+    exit ((scalar(@ARGV) < 2)? 1:0);
 }
 
 my $dbname = $ARGV[0];
 my $howold = $ARGV[1];
 
 my $minfo = "dbname=$dbname";
-$minfo = "$minfo host=$opt_host" if (defined($opt_host));
-$minfo = "$minfo user=$opt_user" if (defined($opt_user));
-$minfo = "$minfo password=$opt_password" if (defined($opt_password));
+$minfo = "$minfo host=$masterhost" if (defined($masterhost));
+$minfo = "$minfo port=$masterport" if (defined($masterport));
+$minfo = "$minfo user=$masteruser" if (defined($masteruser));
+$minfo = "$minfo password=$masterpassword" if (defined($masterpassword));
 
 print "Master connection is $minfo\n" if ($debug);
-print "Slave connection is $sinfo\n" if ($debug);
 
 my $conn = Pg::connectdb($minfo);
 
-$res = CleanLog($conn, $howold);
+my $res = CleanLog($conn, $howold);
 
 exit(1) if $res < 0;