* config/dos.exp (dos_open): Only run global board_info once at

	the beginning of the proc; remove duplicates.
	(dos_load): Use file join to separate path components.
	(dos_copy_upload): Likewise.
	* lib/remote.exp (call_remote): Use error, not "blooie" to trigger
	an error.

3 files changed, 16 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c4d748..e42bf1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-06-02  Ben Elliston  <bje@gnu.org>
 
+	* config/dos.exp (dos_open): Only run global board_info once at
+	the beginning of the proc; remove duplicates.
+	(dos_load): Use file join to separate path components.
+	(dos_copy_upload): Likewise.
+	* lib/remote.exp (call_remote): Use error, not "blooie" to trigger
+	an error.
+
+2006-06-02  Ben Elliston  <bje@gnu.org>
+
 	* contrib/compare_tests: Import from the GCC contrib directory.
 
 2006-05-24  Ben Elliston  <bje@gnu.org>
diff --git a/config/dos.exp b/config/dos.exp
index 5c6f69b..7742a3d 100644
--- a/config/dos.exp
+++ b/config/dos.exp
@@ -24,12 +24,12 @@
 #
 proc dos_open { dest args } {
     global destbat_num
+    global board_info
 
     if {![info exists destbat_num]} {
 	set destbat_num [pid]
     }
     if { [board_info $dest conninfo] == "" } {
-	global board_info
 	set name [board_info $dest name]
 
 	set board_info($name,conninfo) "b${destbat_num}.bat"
@@ -103,7 +103,6 @@ proc dos_open { dest args } {
 	set talias "foo-bar"
     }
 
-    global board_info
     if {[board_info $dest exists name]} {
 	set n [board_info $dest name]
     } else {
@@ -371,16 +370,16 @@ proc dos_load { dest prog args } {
 	    global target_alias
 
 	    set comp [get_multilibs]
-	    if {[file exists "${comp}/winsup/new-cygwin1.dll"]} {
+	    if {[file exists [file join ${comp} winsup new-cygwin1.dll]]} {
 		set dll "${comp}/winsup/new-cygwin1.dll"
 		set dll_name "cygwin1.dll"
-	    } elseif {[file exists "${comp}/winsup/new-cygwin.dll"]} {
+	    } elseif {[file exists [file join ${comp} winsup new-cygwin.dll]]} {
 		set dll "${comp}/winsup/new-cygwin.dll"
 		set dll_name "cygwin.dll"
-	    } elseif {[file exists ${comp}/lib/cygwin1.dll]} {
+	    } elseif {[file exists [file join ${comp} lib cygwin1.dll]]} {
 		set dll "${comp}/lib/cygwin1.dll"
 		set dll_name "cygwin1.dll"
-	    } elseif {[file exists ${comp}/lib/cygwin.dll]} {
+	    } elseif {[file exists [file join ${comp} lib cygwin.dll]]} {
 		set dll "${comp}/lib/cygwin.dll"
 		set dll_name "cygwin.dll"
 	    } else {
@@ -461,7 +460,7 @@ proc dos_copy_download { host localfile remotefile } {
 
 proc dos_copy_upload { host remotefile localfile } {
     remote_file build delete $localfile
-    if {[file exists "[board_info $host local_dir]/$remotefile"]} {
+    if {[file exists [file join [board_info $host local_dir] $remotefile]]} {
 	set result [remote_download build "[board_info $host local_dir]/$remotefile" $localfile]
     } else {
 	set result ""
diff --git a/lib/remote.exp b/lib/remote.exp
index 24037ac..4ccdb6f 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -512,8 +512,7 @@ proc call_remote { type proc dest args } {
 	    global board
 
 	    if {[info exists board]} {
-		# FIXME: WTF?
-		blooie
+		error "board exists"
 	    }
 	    load_board_description $dest
 	    if { $proc == "reboot" } {