Added null check to the GetFtpPath extension method that builds path …

…with variable length args.
Dzoge · Jan 7, 2014 · 3e1abf2 · 3e1abf2
1 parent 162e146
commit 3e1abf2
Show file tree

Hide file tree

Showing 51 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Examples/BeginConnect.cs b/Examples/BeginConnect.cs
diff --git a/Examples/BeginCreateDirectory.cs b/Examples/BeginCreateDirectory.cs
diff --git a/Examples/BeginDeleteDirectory.cs b/Examples/BeginDeleteDirectory.cs
diff --git a/Examples/BeginDeleteFile.cs b/Examples/BeginDeleteFile.cs
diff --git a/Examples/BeginDereferenceLink.cs b/Examples/BeginDereferenceLink.cs
diff --git a/Examples/BeginDirectoryExists.cs b/Examples/BeginDirectoryExists.cs
diff --git a/Examples/BeginDisconnect.cs b/Examples/BeginDisconnect.cs
diff --git a/Examples/BeginExecute.cs b/Examples/BeginExecute.cs
diff --git a/Examples/BeginFileExists.cs b/Examples/BeginFileExists.cs
diff --git a/Examples/BeginGetFileSize.cs b/Examples/BeginGetFileSize.cs
diff --git a/Examples/BeginGetListing.cs b/Examples/BeginGetListing.cs
diff --git a/Examples/BeginGetModifiedTime.cs b/Examples/BeginGetModifiedTime.cs
diff --git a/Examples/BeginGetNameListing.cs b/Examples/BeginGetNameListing.cs
diff --git a/Examples/BeginGetWorkingDirectory.cs b/Examples/BeginGetWorkingDirectory.cs
diff --git a/Examples/BeginOpenAppend.cs b/Examples/BeginOpenAppend.cs
diff --git a/Examples/BeginOpenRead.cs b/Examples/BeginOpenRead.cs
diff --git a/Examples/BeginOpenWrite.cs b/Examples/BeginOpenWrite.cs
diff --git a/Examples/BeginRename.cs b/Examples/BeginRename.cs
diff --git a/Examples/BeginSetWorkingDirectory.cs b/Examples/BeginSetWorkingDirectory.cs
diff --git a/Examples/DereferenceLink.cs b/Examples/DereferenceLink.cs
diff --git a/Examples/GetChecksum.cs b/Examples/GetChecksum.cs
diff --git a/Examples/GetHash.cs b/Examples/GetHash.cs
diff --git a/Examples/GetHashAlgorithm.cs b/Examples/GetHashAlgorithm.cs
diff --git a/Examples/SetHashAlgorithm.cs b/Examples/SetHashAlgorithm.cs
diff --git a/FtpClient.VS2012.sln b/FtpClient.VS2012.sln
diff --git a/Sandcastle/API_Reference_CHM.shfbproj b/Sandcastle/API_Reference_CHM.shfbproj
diff --git a/Sandcastle/API_Reference_HTML.shfbproj b/Sandcastle/API_Reference_HTML.shfbproj
diff --git a/Sandcastle/README.txt b/Sandcastle/README.txt
diff --git a/System.Net.FtpClient/Extensions/GetChecksum.cs b/System.Net.FtpClient/Extensions/GetChecksum.cs
diff --git a/System.Net.FtpClient/Extensions/MD5.cs b/System.Net.FtpClient/Extensions/MD5.cs
diff --git a/System.Net.FtpClient/Extensions/XCRC.cs b/System.Net.FtpClient/Extensions/XCRC.cs
diff --git a/System.Net.FtpClient/Extensions/XMD5.cs b/System.Net.FtpClient/Extensions/XMD5.cs
diff --git a/System.Net.FtpClient/Extensions/XSHA1.cs b/System.Net.FtpClient/Extensions/XSHA1.cs
diff --git a/System.Net.FtpClient/Extensions/XSHA256.cs b/System.Net.FtpClient/Extensions/XSHA256.cs
diff --git a/System.Net.FtpClient/Extensions/XSHA512.cs b/System.Net.FtpClient/Extensions/XSHA512.cs
diff --git a/System.Net.FtpClient/FtpClient.cs b/System.Net.FtpClient/FtpClient.cs
diff --git a/System.Net.FtpClient/FtpExtensionAttribute.cs b/System.Net.FtpClient/FtpExtensionAttribute.cs
diff --git a/System.Net.FtpClient/FtpExtensions.cs b/System.Net.FtpClient/FtpExtensions.cs
@@ -32,6 +32,9 @@ public static string GetFtpPath(this string path) {
         /// <param name="segments">The path segments to append</param>
         /// <returns>A valid FTP path</returns>
         public static string GetFtpPath(this string path, params string[] segments) {
+            if (String.IsNullOrEmpty(path))
+                path = "./";
+
             foreach (string part in segments) {
                 if (part != null) {
                     if (path.Length > 0 && !path.EndsWith("/"))

diff --git a/System.Net.FtpClient/FtpHash.cs b/System.Net.FtpClient/FtpHash.cs
diff --git a/System.Net.FtpClient/FtpListItem.cs b/System.Net.FtpClient/FtpListItem.cs
diff --git a/System.Net.FtpClient/FtpTrace.cs b/System.Net.FtpClient/FtpTrace.cs
diff --git a/System.Net.FtpClient/IFtpClient.cs b/System.Net.FtpClient/IFtpClient.cs
diff --git a/System.Net.FtpClient/IFtpListItem.cs b/System.Net.FtpClient/IFtpListItem.cs
diff --git a/System.Net.FtpClient/IFtpReply.cs b/System.Net.FtpClient/IFtpReply.cs
diff --git a/System.Net.FtpClient/System.Net.FtpClient.NET2.csproj b/System.Net.FtpClient/System.Net.FtpClient.NET2.csproj
diff --git a/System.Net.FtpClient/System.Net.FtpClient.NET2.sln b/System.Net.FtpClient/System.Net.FtpClient.NET2.sln
diff --git a/Tests/Program.cs b/Tests/Program.cs
@@ -24,7 +24,7 @@ static void Main(string[] args) {
             FtpTrace.AddListener(new ConsoleTraceListener());
 
             try {
-                /*foreach (int i in new int[] {
+                foreach (int i in new int[] {
                      (int)FtpDataConnectionType.EPSV,
                      (int)FtpDataConnectionType.EPRT,
                      (int)FtpDataConnectionType.PASV,
@@ -41,7 +41,7 @@ static void Main(string[] args) {
                         Download(cl);
                         Delete(cl);
                     }
-                }*/
+                }
 
                 //TestServer();
 

diff --git a/build_docs.bat b/build_docs.bat
diff --git a/create_codeplex_release.bat b/create_codeplex_release.bat
diff --git a/create_nuget_release.bat b/create_nuget_release.bat