From 09f0f026fd4931b90016d0090778983da01c294a Mon Sep 17 00:00:00 2001
From: unknown <unknown@unknown>
Date: Wed, 17 Dec 2008 03:43:51 +0000
Subject: Imported from rancid-2.3.2a9.tar.gz.

---
 bin/tntlogin.in | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'bin/tntlogin.in')

diff --git a/bin/tntlogin.in b/bin/tntlogin.in
index 16a742e..8a265b3 100644
--- a/bin/tntlogin.in
+++ b/bin/tntlogin.in
@@ -3,7 +3,7 @@
 ## $Id$
 ##
 ## @PACKAGE@ @VERSION@
-## Copyright (c) 1997-2007 by Terrapin Communications, Inc.
+## Copyright (c) 1997-2008 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
 ## This code is derived from software contributed to and maintained by
@@ -381,16 +381,16 @@ proc login { router user userpswd passwd prompt cmethod cyphertype } {
 	    return 1 }
 
 	-re "$u_prompt"			{
-					  send "$user\r"
+					  send -- "$user\r"
 					  set uprompt_seen 1
 					  exp_continue
 					}
 	-re "$p_prompt"			{
 					  sleep 1
 					  if {$uprompt_seen == 1} {
-						send "$userpswd\r"
+						send -- "$userpswd\r"
 					  } else {
-						send "$passwd\r"
+						send -- "$passwd\r"
 					  }
 					  exp_continue
 					}
@@ -420,25 +420,14 @@ proc run_commands { prompt command } {
     expect -re $prompt {}
     regsub -all "\[)(]" $prompt {\\&} reprompt
 
-    # Is this a multi-command?
-    if [ string match "*\;*" "$command" ] {
-	set commands [split $command \;]
-	set num_commands [llength $commands]
-	for {set i 0} {$i < $num_commands} { incr i} {
-	    send "[subst -nocommands [lindex $commands $i]]\r"
-	    expect {
-		-re "^\[^\n\r]*$reprompt"	{}
-		-re "^\[^\n\r ]*>>.*$reprompt"	{ exp_continue }
-		-re "\[\n\r]+"			{ exp_continue }
-	    }
-	}
-    } else {
-	send "[subst -nocommands $command]\r"
-	send "y\r"
+    set commands [split $command \;]
+    set num_commands [llength $commands]
+    for {set i 0} {$i < $num_commands} { incr i} {
+	send -- "[subst -nocommands [lindex $commands $i]]\r"
 	expect {
-		-re "^\[^\n\r]*$reprompt"	{}
-		-re "^\[^\n\r ]*>>.*$reprompt"	{ exp_continue }
-		-re "\[\n\r]+"			{ exp_continue }
+	    -re "^\[^\n\r]*$reprompt"		{}
+	    -re "^\[^\n\r ]*>>.*$reprompt"	{ exp_continue }
+	    -re "\[\n\r]+"			{ exp_continue }
 	}
     }
 
-- 
cgit