scmno****@osdn*****
scmno****@osdn*****
2018年 9月 15日 (土) 15:06:35 JST
Revision: 7245 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7245 Author: zmatsuo Date: 2018-09-15 15:06:35 +0900 (Sat, 15 Sep 2018) Log Message: ----------- Merge branch 'master' into cmake-merge Modified Paths: -------------- branches/cmake/teraterm/common/ttlib.c branches/cmake/teraterm/ttpfile/ttfile.c -------------- next part -------------- Modified: branches/cmake/teraterm/common/ttlib.c =================================================================== --- branches/cmake/teraterm/common/ttlib.c 2018-09-15 05:00:23 UTC (rev 7244) +++ branches/cmake/teraterm/common/ttlib.c 2018-09-15 06:06:35 UTC (rev 7245) @@ -224,7 +224,7 @@ Ptr = &PathName[2]; else Ptr = PathName; - if (Ptr[0]=='\\') + if (Ptr[0]=='\\' || Ptr[0]=='/') Ptr = CharNext(Ptr); DirPtr = Ptr; @@ -236,6 +236,7 @@ switch (b) { case ':': return FALSE; + case '/': /* FALLTHROUGH */ case '\\': DirPtr = PtrOld; FNPtr = Ptr; Modified: branches/cmake/teraterm/ttpfile/ttfile.c =================================================================== --- branches/cmake/teraterm/ttpfile/ttfile.c 2018-09-15 05:00:23 UTC (rev 7244) +++ branches/cmake/teraterm/ttpfile/ttfile.c 2018-09-15 06:06:35 UTC (rev 7245) @@ -51,6 +51,7 @@ #include <stdlib.h> #include <stdio.h> #include <io.h> +#include <assert.h> #include "compat_w95.h" @@ -175,6 +176,14 @@ break; } +#if defined(_DEBUG) + if (!Ok) { + DWORD Err = GetLastError(); + DWORD DlgErr = CommDlgExtendedError(); + assert(Err == 0 && DlgErr == 0); + } +#endif + /* restore dir */ _chdir(TempDir);