Enhance routines for connections with FTPIS.

[ffftp/ffftp.git] / misc.c

diff --git a/misc.c b/misc.c
index cc00144..ac0539c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1733,6 +1733,7 @@ char *MakeNumString(LONGLONG Num, char *Buf, BOOL Comma)
 // 現在UNC対応の予定は無い\r
 char* MakeDistinguishableFileName(char* Out, char* In)\r
 {\r
+       char* Fname;\r
        char Tmp[FMAX_PATH+1];\r
        char Tmp2[FMAX_PATH+3];\r
        HANDLE hFind;\r
@@ -1741,6 +1742,7 @@ char* MakeDistinguishableFileName(char* Out, char* In)
                strcpy(Out, In);\r
        else\r
        {\r
+               Fname = GetFileName(In);\r
                strcpy(Tmp, In);\r
                strcpy(Tmp2, Tmp);\r
                strcat(Tmp2, ".*");\r
@@ -1748,12 +1750,12 @@ char* MakeDistinguishableFileName(char* Out, char* In)
                {\r
                        do\r
                        {\r
-                               if(strchr(Find.cFileName, '.'))\r
+                               if(strcmp(Find.cFileName, Fname) != 0)\r
                                        break;\r
                        }\r
                        while(FindNextFile(hFind, &Find));\r
                        FindClose(hFind);\r
-                       if(strchr(Find.cFileName, '.'))\r
+                       if(strcmp(Find.cFileName, Fname) != 0)\r
                        {\r
                                strcat(Tmp, " ");\r
                                strcpy(Tmp2, Tmp);\r