--- bin/ApplySnapshot	2003/08/05 09:52:36	1.3
+++ bin/ApplySnapshot	2003/08/05 21:10:28	1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # ApplySnapshot
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,43 +6,58 @@
     & 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 RServ;
 use Getopt::Long;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s", "snapshot=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 1)) {
-    print "Usage: $0 --host=name --user=name --password=string --snapshot=file slavedb\n";
+my ($debug,$verbose) = (0,0);
+my ($help,$slavehost,$slaveport,$slaveuser,$slavepassword);
+my $snapshot = "__Snapshot";
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
+	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
+	"snapshot=s" => \$snapshot,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 1)) {
+    print "Usage: $0 [options] slavedb
+Options:
+	--slavehost=hostname --slaveport=port
+	--slaveuser=username --slavepassword=string
+	--snapshot=snapshot
+";
     exit ((scalar(@ARGV) < 1)? 1:0);
 }
 
 my $slave = $ARGV[0] || "slave";
 
 my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
+$sinfo = "$sinfo host=$slavehost" if (defined($slavehost));
+$sinfo = "$sinfo port=$slaveport" if (defined($slaveport));
+$sinfo = "$sinfo user=$slaveuser" if (defined($slaveuser));
+$sinfo = "$sinfo password=$slavepassword" if (defined($slavepassword));
 
 my $conn = Pg::connectdb($sinfo);
 
 my $inpf;
-if (defined($opt_snapshot)) {
+if (defined($snapshot)) {
     $inpf = new IO::File;
-    $inpf->open("< $opt_snapshot"); 
+    $inpf->open("< $snapshot"); 
 } else {
-    $inpf = STDIN;
+    $inpf = *STDIN;
 }
 
-$res = ApplySnapshot ($conn, $inpf);
+my $res = ApplySnapshot ($conn, $inpf);
 
 if ($res > 0)
 {