#include <string.h>\r
#include <mbstring.h>\r
#include <time.h>\r
-#include <winsock.h>\r
+// IPv6対応\r
+//#include <winsock.h>\r
+#include <winsock2.h>\r
#include <windowsx.h>\r
#include <commctrl.h>\r
\r
strcpy(Buf, Tmp);\r
ReplaceAll(Buf, '\\', '/');\r
ChangeSepaRemote2Local(Buf);\r
- ChangeFnameRemote2Local(Buf, FMAX_PATH);\r
}\r
else\r
Sts = FTP_ERROR*100;\r
iContinue = NO;\r
iRetCode = ReadOneLine(cSkt, Tmp, ONELINE_BUF_SIZE, CancelCheckWork);\r
\r
+ // 文字化け対策\r
+ ChangeFnameRemote2Local(Tmp, ONELINE_BUF_SIZE);\r
SetTaskMsg("%s", Tmp);\r
\r
if(Buf != NULL)\r
char *Buf;\r
char *Pos;\r
CODECONVINFO cInfo;\r
+ // バッファ上書きバグ対策\r
+ char *Buf2;\r
\r
Sts = FFFTP_FAIL;\r
if((Buf = malloc(Max)) != NULL)\r
{\r
+ // バッファ上書きバグ対策\r
+ if((Buf2 = malloc(strlen(Fname) + 1)) != NULL)\r
+ {\r
InitCodeConvInfo(&cInfo);\r
cInfo.KanaCnv = NO; //AskHostNameKana();\r
- cInfo.Str = Fname;\r
+ // バッファ上書きバグ対策\r
+// cInfo.Str = Fname;\r
+ strcpy(Buf2, Fname);\r
+ cInfo.Str = Buf2;\r
cInfo.StrLen = strlen(Fname);\r
cInfo.Buf = Buf;\r
cInfo.BufSize = Max - 1;\r
// strcpy(Pos, Buf);\r
// break;\r
}\r
- free(Buf);\r
+ // バッファ上書きバグ対策\r
+ free(Buf2);\r
Sts = FFFTP_SUCCESS;\r
+ }\r
+ free(Buf);\r
+ // バッファ上書きバグ対策\r
+// Sts = FFFTP_SUCCESS;\r
}\r
return(Sts);\r
}\r
char *Buf;\r
char *Pos;\r
CODECONVINFO cInfo;\r
+ // バッファ上書きバグ対策\r
+ char *Buf2;\r
\r
Sts = FFFTP_FAIL;\r
if((Buf = malloc(Max)) != NULL)\r
{\r
+ // バッファ上書きバグ対策\r
+ if((Buf2 = malloc(strlen(Fname) + 1)) != NULL)\r
+ {\r
InitCodeConvInfo(&cInfo);\r
cInfo.KanaCnv = AskHostNameKana();\r
- cInfo.Str = Fname;\r
+ // バッファ上書きバグ対策\r
+// cInfo.Str = Fname;\r
+ strcpy(Buf2, Fname);\r
+ cInfo.Str = Buf2;\r
cInfo.StrLen = strlen(Fname);\r
cInfo.Buf = Buf;\r
cInfo.BufSize = Max - 1;\r
// strcpy(Pos, Buf);\r
// break;\r
}\r
- free(Buf);\r
+ // バッファ上書きバグ対策\r
+ free(Buf2);\r
Sts = FFFTP_SUCCESS;\r
+ }\r
+ free(Buf);\r
+ // バッファ上書きバグ対策\r
+// Sts = FFFTP_SUCCESS;\r
}\r
return(Sts);\r
}\r