Tcl Library Source Code

Artifact [8906b28b1c]
Login

Artifact 8906b28b1c65650bed8e9d6a6969a0b120c67e6883f5f46352e18707f7396682:

Attachment "ftp.patch" to ticket [2eb11228fb] added by chwchw 2021-07-10 15:51:00. (unpublished)
Index: modules/ftp/ftp.tcl
==================================================================
--- modules/ftp/ftp.tcl
+++ modules/ftp/ftp.tcl
@@ -1811,30 +1811,32 @@
     }
 
     set ftp(inline) 0
     set flags 1
     set source ""
+    set gotSource 0
     set dest ""
     foreach arg $args {
         if {[string equal $arg "--"]} {
             set flags 0
         } elseif {($flags) && ([string equal $arg "-data"])} {
             set ftp(inline) 1
             set ftp(filebuffer) ""
         } elseif {($flags) && ([string equal $arg "-channel"])} {
             set ftp(inline) 2
-	} elseif {$source == ""} {
+	} elseif {!$gotSource} {
             set source $arg
+            incr gotSource
 	} elseif {$dest == ""} {
             set dest $arg
 	} else {
             DisplayMsg $s "wrong # args: should be \"ftp::Put handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
 	    return 0
         }
     }
 
-    if {($source == "")} {
+    if {!$gotSource} {
         DisplayMsg $s "Must specify a valid data source to Put" error
         return 0
     }        
 
     set ftp(RemoteFilename) $dest
@@ -1926,30 +1928,32 @@
     }
 
     set ftp(inline) 0
     set flags 1
     set source ""
+    set gotSource 0
     set dest ""
     foreach arg $args {
         if {[string equal $arg "--"]} {
             set flags 0
         } elseif {($flags) && ([string equal $arg "-data"])} {
             set ftp(inline) 1
             set ftp(filebuffer) ""
         } elseif {($flags) && ([string equal $arg "-channel"])} {
             set ftp(inline) 2
-        } elseif {$source == ""} {
+        } elseif {!$gotSource} {
             set source $arg
+            incr gotSource
         } elseif {$dest == ""} {
             set dest $arg
         } else {
             DisplayMsg $s "wrong # args: should be \"ftp::Append handle (-data \"data\" | -channel chan | localFilename) remoteFilename\"" error
             return 0
         }
     }
 
-    if {($source == "")} {
+    if {!$gotSource} {
         DisplayMsg $s "Must specify a valid data source to Append" error
         return 0
     }   
 
     set ftp(RemoteFilename) $dest