Catch CWD in Execute to invalidate cwd cache

Adhara3 · Nov 3, 2021 · 6e9b4f6 · 6e9b4f6
1 parent 860af73
commit 6e9b4f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/FluentFTP/Client/FtpClient_FolderManagement.cs b/FluentFTP/Client/FtpClient_FolderManagement.cs
@@ -646,7 +646,8 @@ public void SetWorkingDirectory(string path) {
 				}
 
 				// invalidate the cached path
-				_LastWorkingDir = null;
+				// This is redundant, Execute(...) will see the CWD and do this
+				//_LastWorkingDir = null;
 
 #if !CORE14
 			}
@@ -680,7 +681,8 @@ public void SetWorkingDirectory(string path) {
 			}
 
 			// invalidate the cached path
-			_LastWorkingDir = null;
+			// This is redundant, Execute(...) will see the CWD and do this
+			//_LastWorkingDir = null;
 		}
 
 

diff --git a/FluentFTP/Client/FtpClient_Stream.cs b/FluentFTP/Client/FtpClient_Stream.cs
@@ -72,6 +72,11 @@ public FtpReply Execute(string command) {
 					commandTxt = "PASS ***";
 				}
 
+				// A CWD will invalidate the cached value.
+				if (command.StartsWith("CWD ", StringComparison.Ordinal)) {
+					_LastWorkingDir = null;
+				}
+
 				LogLine(FtpTraceLevel.Info, "Command:  " + commandTxt);
 
 				// send command to FTP server