/[dejagnu]/dejagnu/lib/rsh.exp
ViewVC logotype

Diff of /dejagnu/lib/rsh.exp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by rsavoye, Mon Mar 17 02:25:07 2003 UTC revision 1.6 by bje, Thu Aug 7 03:42:43 2003 UTC
# Line 33  proc rsh_open { hostname } { Line 33  proc rsh_open { hostname } {
33              set RSH rsh              set RSH rsh
34          }          }
35      } else {      } else {
36          set RSH [board_info $hostname rsh_prog];          set RSH [board_info $hostname rsh_prog]
37      }      }
38    
39      if [board_info $hostname exists username] {      if [board_info $hostname exists username] {
# Line 44  proc rsh_open { hostname } { Line 44  proc rsh_open { hostname } {
44    
45      # get the hostname and port number from the config array      # get the hostname and port number from the config array
46      if [board_info $hostname exists name] {      if [board_info $hostname exists name] {
47          set hostname [board_info $hostname name];          set hostname [board_info $hostname name]
48      }      }
49      set hostname [lindex [split [board_info ${hostname} netport] ":"] 0]      set hostname [lindex [split [board_info ${hostname} netport] ":"] 0]
50      if [board_info ${hostname} exists shell_prompt] {      if [board_info ${hostname} exists shell_prompt] {
# Line 54  proc rsh_open { hostname } { Line 54  proc rsh_open { hostname } {
54      }      }
55    
56      if [board_info $hostname exists fileid] {      if [board_info $hostname exists fileid] {
57          unset board_info($hostname,fileid);          unset board_info($hostname,fileid)
58      }      }
59    
60      spawn $RSH $rsh_useropts $hostname      spawn $RSH $rsh_useropts $hostname
# Line 152  proc rsh_open { hostname } { Line 152  proc rsh_open { hostname } {
152  proc rsh_download {desthost srcfile destfile} {  proc rsh_download {desthost srcfile destfile} {
153      # must be done before desthost is rewritten      # must be done before desthost is rewritten
154      if [board_info $desthost exists rcp_prog] {      if [board_info $desthost exists rcp_prog] {
155          set RCP [board_info $desthost rcp_prog];          set RCP [board_info $desthost rcp_prog]
156      } else {      } else {
157          set RCP rcp          set RCP rcp
158      }      }
159    
160      if [board_info $desthost exists rsh_prog] {      if [board_info $desthost exists rsh_prog] {
161          set RSH [board_info $desthost rsh_prog];          set RSH [board_info $desthost rsh_prog]
162      } else {      } else {
163          if { [which remsh] != 0 } {          if { [which remsh] != 0 } {
164              set RSH remsh              set RSH remsh
# Line 176  proc rsh_download {desthost srcfile dest Line 176  proc rsh_download {desthost srcfile dest
176      }      }
177    
178      if [board_info $desthost exists name] {      if [board_info $desthost exists name] {
179          set desthost [board_info $desthost name];          set desthost [board_info $desthost name]
180      }      }
181    
182      if [board_info $desthost exists hostname] {      if [board_info $desthost exists hostname] {
183          set desthost [board_info $desthost hostname];          set desthost [board_info $desthost hostname]
184      }      }
185    
186      set status [catch "exec $RSH $rsh_useropts $desthost rm -f $destfile |& cat" output]      set status [catch "exec $RSH $rsh_useropts $desthost rm -f $destfile |& cat" output]
187      set status [catch "exec $RCP $srcfile $rcp_user$desthost:$destfile |& cat" output]      set status [catch "exec $RCP $srcfile $rcp_user$desthost:$destfile |& cat" output]
188      if { $status == 0 } {      if { $status == 0 } {
189          verbose "Copied $srcfile to $desthost:$destfile" 2          verbose "Copied $srcfile to $desthost:$destfile" 2
190          return $destfile;          return $destfile
191      } else {      } else {
192          verbose "Download to $desthost failed, $output."          verbose "Download to $desthost failed, $output."
193          return ""          return ""
# Line 196  proc rsh_download {desthost srcfile dest Line 196  proc rsh_download {desthost srcfile dest
196    
197  proc rsh_upload {desthost srcfile destfile} {  proc rsh_upload {desthost srcfile destfile} {
198      if [board_info $desthost exists rcp_prog] {      if [board_info $desthost exists rcp_prog] {
199          set RCP [board_info $desthost rcp_prog];          set RCP [board_info $desthost rcp_prog]
200      } else {      } else {
201          set RCP rcp          set RCP rcp
202      }      }
# Line 208  proc rsh_upload {desthost srcfile destfi Line 208  proc rsh_upload {desthost srcfile destfi
208      }      }
209    
210      if [board_info $desthost exists name] {      if [board_info $desthost exists name] {
211          set desthost [board_info $desthost name];          set desthost [board_info $desthost name]
212      }      }
213    
214      if [board_info $desthost exists hostname] {      if [board_info $desthost exists hostname] {
215          set desthost [board_info $desthost hostname];          set desthost [board_info $desthost hostname]
216      }      }
217    
218      set status [catch "exec $RCP $rcp_user$desthost:$srcfile $destfile" output];      set status [catch "exec $RCP $rcp_user$desthost:$srcfile $destfile" output]
219      if { $status == 0 } {      if { $status == 0 } {
220          verbose "Copied $desthost:$srcfile to $destfile" 2          verbose "Copied $desthost:$srcfile to $destfile" 2
221          return $destfile;          return $destfile
222      } else {      } else {
223          verbose "Upload from $desthost failed, $output."          verbose "Upload from $desthost failed, $output."
224          return ""          return ""
# Line 230  proc rsh_upload {desthost srcfile destfi Line 230  proc rsh_upload {desthost srcfile destfi
230  #  #
231  proc rsh_exec { boardname cmd args } {  proc rsh_exec { boardname cmd args } {
232      if { [llength $args] > 0 } {      if { [llength $args] > 0 } {
233          set pargs [lindex $args 0];          set pargs [lindex $args 0]
234          if { [llength $args] > 1 } {          if { [llength $args] > 1 } {
235              set inp [lindex $args 1];              set inp [lindex $args 1]
236          } else {          } else {
237              set inp "";              set inp ""
238          }          }
239      } else {      } else {
240          set pargs ""          set pargs ""
# Line 250  proc rsh_exec { boardname cmd args } { Line 250  proc rsh_exec { boardname cmd args } {
250              set RSH rsh              set RSH rsh
251          }          }
252      } else {      } else {
253          set RSH [board_info $boardname rsh_prog];          set RSH [board_info $boardname rsh_prog]
254      }      }
255    
256      if [board_info $boardname exists username] {      if [board_info $boardname exists username] {
# Line 260  proc rsh_exec { boardname cmd args } { Line 260  proc rsh_exec { boardname cmd args } {
260      }      }
261    
262      if [board_info $boardname exists name] {      if [board_info $boardname exists name] {
263          set boardname [board_info $boardname name];          set boardname [board_info $boardname name]
264      }      }
265    
266      if [board_info $boardname exists hostname] {      if [board_info $boardname exists hostname] {
267          set hostname [board_info $boardname hostname];          set hostname [board_info $boardname hostname]
268      } else {      } else {
269          set hostname $boardname;          set hostname $boardname
270      }      }
271    
272    

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26