• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7245 (tree)
Time2018-09-15 15:06:35
Authorzmatsuo

Log Message

Merge branch 'master' into cmake-merge

Change Summary

Incremental Difference

--- branches/cmake/teraterm/ttpfile/ttfile.c (revision 7244)
+++ branches/cmake/teraterm/ttpfile/ttfile.c (revision 7245)
@@ -51,6 +51,7 @@
5151 #include <stdlib.h>
5252 #include <stdio.h>
5353 #include <io.h>
54+#include <assert.h>
5455
5556 #include "compat_w95.h"
5657
@@ -175,6 +176,14 @@
175176 break;
176177 }
177178
179+#if defined(_DEBUG)
180+ if (!Ok) {
181+ DWORD Err = GetLastError();
182+ DWORD DlgErr = CommDlgExtendedError();
183+ assert(Err == 0 && DlgErr == 0);
184+ }
185+#endif
186+
178187 /* restore dir */
179188 _chdir(TempDir);
180189
--- branches/cmake/teraterm/common/ttlib.c (revision 7244)
+++ branches/cmake/teraterm/common/ttlib.c (revision 7245)
@@ -224,7 +224,7 @@
224224 Ptr = &PathName[2];
225225 else
226226 Ptr = PathName;
227- if (Ptr[0]=='\\')
227+ if (Ptr[0]=='\\' || Ptr[0]=='/')
228228 Ptr = CharNext(Ptr);
229229
230230 DirPtr = Ptr;
@@ -236,6 +236,7 @@
236236 switch (b) {
237237 case ':':
238238 return FALSE;
239+ case '/': /* FALLTHROUGH */
239240 case '\\':
240241 DirPtr = PtrOld;
241242 FNPtr = Ptr;
Show on old repository browser