From 96dc4026054df77affedfe50380a661dcdba732a Mon Sep 17 00:00:00 2001
From: Tar Committer <tar@ocjtech.us>
Date: Thu, 7 Jul 2005 01:14:43 +0000
Subject: Imported from rancid-2.3.2a2.tar.gz.

---
 bin/prancid.in | 61 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'bin/prancid.in')

diff --git a/bin/prancid.in b/bin/prancid.in
index 7ded178..d3e71a4 100755
--- a/bin/prancid.in
+++ b/bin/prancid.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: prancid.in,v 1.29 2004/01/11 03:49:13 heas Exp $
+## $Id: prancid.in,v 1.32 2005/06/15 20:54:41 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -33,16 +33,17 @@ $file = $opt_f;
 $host = $ARGV[0];
 $clean_run = 0;
 $found_end = 0;
-$timeo = 90;			# clogin timeout in seconds
+$timeo = 90;				# clogin timeout in seconds
 
-my($platform);			# platform/cpu type
-my(%filter_pwds);		# password filtering mode
+my(@commandtable, %commands, @commands);# command lists
+my(%filter_pwds);			# password filtering mode
+my($platform);				# platform/cpu type
 
 # This routine is used to print out the router configuration
 sub ProcessHistory {
-    my($new_hist_tag,$new_command,$command_string,@string)=(@_);
-    if((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
-       && defined %history) {
+    my($new_hist_tag,$new_command,$command_string,@string) = (@_);
+    if ((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
+	&& defined %history) {
 	print eval "$command \%history";
 	undef %history;
     }
@@ -64,10 +65,10 @@ sub ProcessHistory {
 
 sub numerically { $a <=> $b; }
 
-# This is a sort routing that will sort numerically on the
+# This is a sort routine that will sort numerically on the
 # keys of a hash as if it were a normal array.
 sub keynsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort numerically keys(%lines)) {
@@ -77,10 +78,10 @@ sub keynsort {
     @sorted_lines;
 }
 
-# This is a sort routing that will sort on the
+# This is a sort routine that will sort on the
 # keys of a hash as if it were a normal array.
 sub keysort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort keys(%lines)) {
@@ -90,10 +91,10 @@ sub keysort {
     @sorted_lines;
 }
 
-# This is a sort routing that will sort on the
+# This is a sort routine that will sort on the
 # values of a hash as if it were a normal array.
 sub valsort{
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort values %lines) {
@@ -103,9 +104,9 @@ sub valsort{
     @sorted_lines;
 }
 
-# This is a numerical sort routing (ascending).
+# This is a numerical sort routine (ascending).
 sub numsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $num (sort {$a <=> $b} keys %lines) {
@@ -119,7 +120,7 @@ sub numsort {
 # ip address when the ip address is anywhere in
 # the strings.
 sub ipsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $addr (sort sortbyipaddr keys %lines) {
@@ -132,7 +133,7 @@ sub ipsort {
 # These two routines will sort based upon IP addresses
 sub ipaddrval {
     my(@a) = ($_[0] =~ m#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#);
-    $a[3]+256*($a[2]+256*($a[1]+256*$a[0]));
+    $a[3] + 256 * ($a[2] + 256 * ($a[1] +256 * $a[0]));
 }
 sub sortbyipaddr {
     &ipaddrval($a) <=> &ipaddrval($b);
@@ -460,22 +461,18 @@ sub WriteTerm {
 sub DoNothing {print STDOUT;}
 
 # Main
-%commands=(
-	'show version all'	=> "ShowVersion",
-	'show package'		=> "ShowPackage",
-	'show hardware'		=> "ShowHardware",
-	'show inventory'	=> "ShowInventory",
-	'write term'		=> "WriteTerm"
-);
-# keys() doesnt return things in the order entered and the order of the
-# cmds is important (show version first and write term last). pita
-@commands=(
-	"show version all",
-	"show package",
-	"show hardware",
-	"show inventory",
-	"write term"
+@commandtable = (
+	{'show version all'	=> 'ShowVersion'},
+	{'show package'		=> 'ShowPackage'},
+	{'show hardware'	=> 'ShowHardware'},
+	{'show inventory'	=> 'ShowInventory'},
+	{'write term'		=> 'WriteTerm'}
 );
+# Use an array to preserve the order of the commands and a hash for mapping
+# commands to the subroutine and track commands that have been completed.
+@commands = map(keys(%$_), @commandtable);
+%commands = map(%$_, @commandtable);
+
 $cisco_cmds=join(";",@commands);
 $cmds_regexp=join("|",@commands);
 
-- 
cgit 


From 1cc9f22072de1d314a67387aac57740fb25c5258 Mon Sep 17 00:00:00 2001
From: Tar Committer <tar@ocjtech.us>
Date: Thu, 4 May 2006 21:40:56 +0000
Subject: Imported from rancid-2.3.2a4.tar.gz.

---
 bin/prancid.in | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'bin/prancid.in')

diff --git a/bin/prancid.in b/bin/prancid.in
index d3e71a4..47eda29 100755
--- a/bin/prancid.in
+++ b/bin/prancid.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: prancid.in,v 1.32 2005/06/15 20:54:41 heas Exp $
+## $Id: prancid.in,v 1.33 2005/09/25 17:48:30 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -23,7 +23,7 @@
 #
 #  RANCID - Really Awesome New Cisco confIg Differ
 #
-# usage: rancid [-d] [-l] [-f filename | $host]
+# usage: rancid [-d] [-l] [-f filename | hostname]
 #
 use Getopt::Std;
 getopts('dfl');
@@ -476,6 +476,15 @@ sub DoNothing {print STDOUT;}
 $cisco_cmds=join(";",@commands);
 $cmds_regexp=join("|",@commands);
 
+if (length($host) == 0) {
+    if ($file) {
+	print(STDERR "Too few arguments: file name required\n");
+	exit(1);
+    } else {
+	print(STDERR "Too few arguments: host name required\n");
+	exit(1);
+    }
+}
 open(OUTPUT,">$host.new") || die "Can't open $host.new for writing: $!\n";
 select(OUTPUT);
 # make OUTPUT unbuffered if debugging
-- 
cgit 


From a0be206eb419f63eeb436631cc91b3456dff006f Mon Sep 17 00:00:00 2001
From: Tar Committer <tar@ocjtech.us>
Date: Sat, 12 Aug 2006 02:59:43 +0000
Subject: Imported from rancid-2.3.2a5.tar.gz.

---
 bin/prancid.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/prancid.in')

diff --git a/bin/prancid.in b/bin/prancid.in
index 47eda29..acee537 100755
--- a/bin/prancid.in
+++ b/bin/prancid.in
@@ -1,8 +1,8 @@
 #! @PERLV_PATH@
 ##
-## $Id: prancid.in,v 1.33 2005/09/25 17:48:30 heas Exp $
+## $Id: prancid.in,v 1.34 2006/05/28 16:38:52 heas Exp $
 ##
-## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
+## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
 ## This software may be freely copied, modified and redistributed
-- 
cgit 


From 1a7c45398738cdb4eaafdc9e0962272f19d54816 Mon Sep 17 00:00:00 2001
From: Tar Committer <tar@ocjtech.us>
Date: Tue, 5 Dec 2006 16:52:12 +0000
Subject: Imported from rancid-2.3.2a6.tar.gz.

---
 bin/prancid.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'bin/prancid.in')

diff --git a/bin/prancid.in b/bin/prancid.in
index acee537..4777675 100755
--- a/bin/prancid.in
+++ b/bin/prancid.in
@@ -1,7 +1,8 @@
 #! @PERLV_PATH@
 ##
-## $Id: prancid.in,v 1.34 2006/05/28 16:38:52 heas Exp $
+## $Id: prancid.in,v 1.35 2006/10/05 04:27:43 heas Exp $
 ##
+## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
@@ -23,10 +24,14 @@
 #
 #  RANCID - Really Awesome New Cisco confIg Differ
 #
-# usage: rancid [-d] [-l] [-f filename | hostname]
+# usage: rancid [-dV] [-l] [-f filename | hostname]
 #
 use Getopt::Std;
-getopts('dfl');
+getopts('dflV');
+if ($opt_V) {
+    print "@PACKAGE@ @VERSION@\n";
+    exit(0);
+}
 $log = $opt_l;
 $debug = $opt_d;
 $file = $opt_f;
-- 
cgit