Replacement of path resolving in GetNameListing with code from GetLis…

…ting.

.gitignore

@@ -0,0 +1,2 @@
+/System.Net.FtpClient/bin
+/System.Net.FtpClient/obj

System.Net.FtpClient/FtpClient.cs

@@ -2020,13 +2020,28 @@ public string[] GetNameListing(string path) {
             List<string> lst = new List<string>();
             string pwd = GetWorkingDirectory();
 
-            if (path == null || path.GetFtpPath().Trim().Length == 0 || path.StartsWith(".")) {
+            /*if (path == null || path.GetFtpPath().Trim().Length == 0 || path.StartsWith(".")) {
                 if (pwd == null || pwd.Length == 0) // couldn't get the working directory
                     path = "./";
                 else if (path.StartsWith("./"))
                     path = string.Format("{0}/{1}", pwd, path.Remove(0, 2));
                 else
                     path = pwd;
+            }*/
+
+            path = path.GetFtpPath();
+            if (path == null || path.Trim().Length == 0)
+            {
+                if (pwd != null && pwd.Trim().Length > 0)
+                    path = pwd;
+                else
+                    path = "./";
+            }
+            else if (!path.StartsWith("/") && pwd != null && pwd.Trim().Length > 0)
+            {
+                if (path.StartsWith("./"))
+                    path = path.Remove(0, 2);
+                path = string.Format("{0}/{1}", pwd, path).GetFtpPath();
             }
 
             try {

System.Net.FtpClient/FtpExtensions.cs

@@ -15,7 +15,7 @@ public static class FtpExtensions {
         /// <param name="path">The file system path</param>
         /// <returns>A path formatted for FTP</returns>
         public static string GetFtpPath(this string path) {
-            if (path == null || path.Length == 0)
+            if (String.IsNullOrEmpty(path))
                 return "./";
 
             path = Regex.Replace(path.Replace('\\', '/'), "[/]+", "/").TrimEnd('/');