Tera TermRevision: 8878
https://osdn.net/projects/ttssh2/scm/svn/commits/8878
Author: zmatsuo
Date: 2020-08-06 00:06:21 +0900 (Thu, 06 Aug 2020)
Log Message:
-----------
ftdlgのファイル名表示が誤っていたので修正
- フルパスからファイル名を抽出するコードを ftdlg.cpp に移動した
Modified Paths:
--------------
branches/filesys_log/teraterm/teraterm/filesys_log.cpp
branches/filesys_log/teraterm/teraterm/ftdlg.cpp
branches/filesys_log/teraterm/teraterm/ftdlg.h
-------------- next part --------------
Modified: branches/filesys_log/teraterm/teraterm/filesys_log.cpp
===================================================================
--- branches/filesys_log/teraterm/teraterm/filesys_log.cpp 2020-08-05 15:06:14 UTC (rev 8877)
+++ branches/filesys_log/teraterm/teraterm/filesys_log.cpp 2020-08-05 15:06:21 UTC (rev 8878)
@@ -680,17 +680,7 @@
PFileVar fv = LogVar;
fv->FullName = _wcsdup(fname);
-
- wchar_t *p = wcsrchr(fv->FullName, L'\\');
- if (p == NULL) {
- p = wcsrchr(fv->FullName, L'/');
- }
- if (p == NULL) {
- fv->FileName = _wcsdup(fv->FullName);
- }
- else {
- fv->FileName = _wcsdup(p + 1);
- }
+ fv->FileName = NULL;
FixLogOption();
if (ts.LogBinary > 0)
Modified: branches/filesys_log/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/filesys_log/teraterm/teraterm/ftdlg.cpp 2020-08-05 15:06:14 UTC (rev 8877)
+++ branches/filesys_log/teraterm/teraterm/ftdlg.cpp 2020-08-05 15:06:21 UTC (rev 8878)
@@ -75,8 +75,23 @@
UILanguageFile = info->UILanguageFile;
OpId = info->OpId;
DlgCaption = _wcsdup(info->DlgCaption);
- FileName = _wcsdup(info->FileName);
FullName = _wcsdup(info->FullName);
+ if (info->FileName != NULL) {
+ FileName = _wcsdup(info->FileName);
+ }
+ else {
+ const wchar_t *fullname = info->FullName;
+ const wchar_t *p = wcsrchr(fullname, L'\\');
+ if (p == NULL) {
+ p = wcsrchr(fullname, L'/');
+ }
+ if (p == NULL) {
+ FileName = _wcsdup(fullname);
+ }
+ else {
+ FileName = _wcsdup(p + 1);
+ }
+ }
HideDialog = info->HideDialog;
HMainWin = info->HMainWin;
Modified: branches/filesys_log/teraterm/teraterm/ftdlg.h
===================================================================
--- branches/filesys_log/teraterm/teraterm/ftdlg.h 2020-08-05 15:06:14 UTC (rev 8877)
+++ branches/filesys_log/teraterm/teraterm/ftdlg.h 2020-08-05 15:06:21 UTC (rev 8878)
@@ -38,8 +38,8 @@
const char *UILanguageFile;
WORD OpId;
wchar_t *DlgCaption;
- wchar_t *FileName;
wchar_t *FullName;
+ wchar_t *FileName; // NULL\x82̂Ƃ\xAB\x81AFullName\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8D쐬\x82\xB7\x82\xE9
BOOL HideDialog;
HWND HMainWin;
} CFileTransDlgInfo;