--- bin/PrepareSnapshot	2003/08/05 09:52:36	1.3
+++ bin/PrepareSnapshot	2003/11/02 15:43:05	1.12
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # PrepareSnapshot
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,65 +6,91 @@
     & 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 IO::File;
 use Getopt::Long;
 use RServ;
-use Sys::Hostname;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "masterhost=s", "masteruser=s", "masterpassword=s", 
-		     "slavehost=s", "slaveuser=s", "slavepassword=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 2)) {
-    print "Usage: $0 --snapshot=file --masterhost=name --masteruser=name --masterpassword=string --slavehost=name --slaveuser=name --slavepassword=string masterdb slavedb\n";
-    exit ((scalar(@ARGV) < 1)? 1:0);
+my ($debug,$verbose) = (0,0);
+my ($help,$masterhost,$masterport,$masteruser,$masterpassword,
+	$slavehost,$slaveport,$slaveuser,$slavepassword,
+	$multiplemaster,$snapshot,
+);
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
+	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"multiplemaster" => \$multiplemaster,
+	"snapshot=s" => \$snapshot,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2)) {
+    print "Usage: $0 [options] masterdb slavedb
+Options:
+	--masterhost=hostname --masterport=port
+	--masteruser=username --masterpassword=string
+	--multiplemaster
+	--snapshot=snapshot
+";
+    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 $slave = $ARGV[1] || "slave";
 
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_masterhost" if (defined($opt_masterhost));
-$minfo = "$minfo user=$opt_masteruser" if (defined($opt_masteruser));
-$minfo = "$minfo password=$opt_masterpassword" if (defined($opt_masterpassword));
-
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_slavehost" if (defined($opt_slavehost));
-$sinfo = "$sinfo user=$opt_slaveuser" if (defined($opt_slaveuser));
-$sinfo = "$sinfo password=$opt_slavepassword" if (defined($opt_slavepassword));
+my $minfo = MkInfo($master,$masterhost,$masterport,$masteruser,$masterpassword);
+my $sinfo = MkInfo($slave,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
 my $mconn = Pg::connectdb($minfo);
-if ($mconn->status != PGRES_CONNECTION_OK) {
+if ($mconn->status != Pg::PGRES_CONNECTION_OK) {
     print STDERR "Failed opening $minfo\n";
     exit 1;
 }
 my $sconn = Pg::connectdb($sinfo);
-if ($sconn->status != PGRES_CONNECTION_OK) {
+if ($sconn->status != Pg::PGRES_CONNECTION_OK) {
     print STDERR "Failed opening $minfo\n";
     exit 1;
 }
 
 my $outf;
-if (defined($opt_snapshot)) {
+if (defined($snapshot)) {
     $outf = new IO::File;    
-    $outf->open("> $opt_snapshot");
+    $outf->open("> $snapshot");
 } else {
-    $outf = STDOUT;
+    $outf = *STDOUT;
 }
 
-$hostname = defined($opt_slavehost) ? $opt_slavehost : hostname;
-$slaveId  = GetSlaveId($mconn, $slave, $hostname);
-die "Unknown SlaveId $slaveId for host $hostname" if ($slaveId < 0);
+$slavehost = 'localhost' if (! $slavehost);
+my $slaveId  = GetServerId($mconn, $slave, $slavehost);
+if (! defined($slaveId)) {
+	print STDERR "Can't find SlaveId for db '$slave' on host $slavehost. Is this database slave?\n";
+	exit 1;
+}
+die "Unknown SlaveId $slaveId for host $slavehost" if ($slaveId < 0);
 
-$res = PrepareSnapshot ($mconn, $sconn, $outf, $slaveId);
+$masterhost = 'localhost' if (! $masterhost);
+my $masterId  = GetServerId($mconn, $master, $masterhost);
+if (! defined($masterId)) {
+	print STDERR "Can't find masterId for db '$master' on host $masterhost. Is this database master?\n";
+	exit 1;
+}
+die "Unknown masterId $masterId for host $masterhost" if ($masterId < 0);
+my $res = PrepareSnapshot ($mconn, $sconn, $outf, $masterId, $slaveId, $multiplemaster);
 
 if ($res == 0)
 {