--- bin/MasterSync	2000/12/21 15:26:04	1.1.1.1
+++ bin/MasterSync	2003/11/02 10:21:45	1.7
@@ -1,4 +1,4 @@
-# -*- perl -*-
+#!/usr/bin/perl -w
 # MasterSync
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,37 +6,59 @@
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-use lib "@LIBDIR@";
+BEGIN {
+	my $basedir = $0; $basedir =~ s#/[^/]+$##;
+	unshift(@INC, "$basedir/../share");
+}
 
+use strict;
 use Getopt::Long;
 use RServ;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "quiet!", "help",
-		     "host=s", "user=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $quiet = $opt_quiet || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
-    print "Usage: $0 --host=name --user=name --password=string masterdb syncid\n";
+my ($debug,$verbose,$quiet) = (0,0,0);
+my ($help,$masterhost,$masterport,$masteruser,$masterpassword);
+my $sserver = 1;
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose,
+	"quiet!" => \$quiet, "help" => \$help,
+	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
+	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"slaveserver=i" => \$sserver,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2) || ($ARGV[1] !~ /^\d+$/)) {
+    print "Usage: $0 [options] masterdb syncid
+Options:
+	--masterhost=hostname --masterport=port
+	--masteruser=username --masterpassword=string
+	--quiet
+	[--slaveserver=slave_number]
+";
     exit ((scalar(@ARGV) < 2)? 1:0);
 }
 
+$RServ::quiet = !$verbose;
+if ($debug) {
+	$RServ::quiet = 0;
+	no warnings 'vars';
+	$RServ::debug = $debug;
+}
+
 my $master = $ARGV[0] || "master";
-my $server = 0;
 my $syncid = $ARGV[1] || die "SyncID not specified";
 
-my $minfo = "dbname=$master";
-$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));
+my $minfo = MkInfo($master,$masterhost,$masterport,$masteruser,$masterpassword);
 
 my $conn = Pg::connectdb($minfo);
+if ($conn->status != Pg::PGRES_CONNECTION_OK) {
+    print STDERR "Failed opening $minfo\n";
+    exit 1;
+}
 
-$res = SyncSyncID($conn, $server, $syncid);
+my $res = SyncSyncID($conn, $sserver, $syncid);
 
 if ($res == 0)
 {