// 64ビット対応\r
//static BOOL CALLBACK SelectDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
static INT_PTR CALLBACK SelectDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
+static int GetImageIndex(int Win, int Pos);\r
static void DispListList(FILELIST *Pos, char *Title);\r
-static void MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
-static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
+// ファイル一覧バグ修正\r
+//static void MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
+//static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
+static int MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
+static int MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork);\r
static void CopyTmpListToFileList(FILELIST **Base, FILELIST *List);\r
static int GetListOneLine(char *Buf, int Max, FILE *Fd);\r
static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir);\r
-static void MakeLocalTree(char *Path, FILELIST **Base);\r
+// ファイル一覧バグ修正\r
+//static void MakeLocalTree(char *Path, FILELIST **Base);\r
+static int MakeLocalTree(char *Path, FILELIST **Base);\r
static void AddFileList(FILELIST *Pkt, FILELIST **Base);\r
-static int AnalizeFileInfo(char *Str);\r
+static int AnalyzeFileInfo(char *Str);\r
static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day);\r
static int CheckHHMMformat(char *Str);\r
static int CheckYYMMDDformat(char *Str, char Sym, int Dig3);\r
static int CheckYYYYMMDDformat(char *Str, char Sym);\r
-static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist);\r
+// Windows Server 2008 R2\r
+static int CheckMMDDYYYYformat(char *Str, char Sym);\r
+static int ResolveFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist);\r
static int FindField(char *Str, char *Buf, int Num, int ToLast);\r
// MLSD対応\r
static int FindField2(char *Str, char *Buf, char Separator, int Num, int ToLast);\r
extern int ListHeight;\r
extern char FilterStr[FILTER_EXT_LEN+1];\r
extern HWND hHelpWin;\r
+// 外部アプリケーションへドロップ後にローカル側のファイル一覧に作業フォルダが表示されるバグ対策\r
+extern int SuppressRefresh;\r
+// ローカル側自動更新\r
+extern HANDLE ChangeNotification;\r
\r
/* 設定値 */\r
extern int LocalWidth;\r
extern int DispIgnoreHide;\r
extern int DispDrives;\r
extern int MoveMode;\r
+// ファイルアイコン表示対応\r
+extern int DispFileIcon;\r
+// タイムスタンプのバグ修正\r
+extern int DispTimeSeconds;\r
+// ファイルの属性を数字で表示\r
+extern int DispPermissionsNumber;\r
\r
/*===== ローカルなワーク =====*/\r
\r
LV_COLUMN LvCol;\r
long Tmp;\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvCol, 0, sizeof(LV_COLUMN));\r
+\r
/*===== ローカル側のリストビュー =====*/\r
\r
+ // 高DPI対応\r
+// hWndListLocal = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
+// WC_LISTVIEWA, NULL,\r
+// WS_CHILD | /*WS_BORDER | */LVS_REPORT | LVS_SHOWSELALWAYS,\r
+// 0, TOOLWIN_HEIGHT*2, LocalWidth, ListHeight,\r
+// GetMainHwnd(), (HMENU)1500, hInst, NULL);\r
hWndListLocal = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
WC_LISTVIEWA, NULL,\r
WS_CHILD | /*WS_BORDER | */LVS_REPORT | LVS_SHOWSELALWAYS,\r
- 0, TOOLWIN_HEIGHT*2, LocalWidth, ListHeight,\r
+ 0, AskToolWinHeight()*2, LocalWidth, ListHeight,\r
GetMainHwnd(), (HMENU)1500, hInst, NULL);\r
\r
if(hWndListLocal != NULL)\r
\r
/*===== ホスト側のリストビュー =====*/\r
\r
+ // 高DPI対応\r
+// hWndListRemote = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
+// WC_LISTVIEWA, NULL,\r
+// WS_CHILD | /*WS_BORDER | */LVS_REPORT | LVS_SHOWSELALWAYS,\r
+// LocalWidth + SepaWidth, TOOLWIN_HEIGHT*2, RemoteWidth, ListHeight,\r
+// GetMainHwnd(), (HMENU)1500, hInst, NULL);\r
hWndListRemote = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
WC_LISTVIEWA, NULL,\r
WS_CHILD | /*WS_BORDER | */LVS_REPORT | LVS_SHOWSELALWAYS,\r
- LocalWidth + SepaWidth, TOOLWIN_HEIGHT*2, RemoteWidth, ListHeight,\r
+ LocalWidth + SepaWidth, AskToolWinHeight()*2, RemoteWidth, ListHeight,\r
GetMainHwnd(), (HMENU)1500, hInst, NULL);\r
\r
if(hWndListRemote != NULL)\r
remove(fn);\r
}\r
\r
+ // 同時接続対応\r
+ DisableUserOpe();\r
+ // 外部アプリケーションへドロップ後にローカル側のファイル一覧に作業フォルダが表示されるバグ対策\r
+ SuppressRefresh = 1;\r
+\r
// ダウンロード先をテンポラリに設定\r
SetLocalDirHist(TmpDir);\r
\r
SetLocalDirHist(LocDir);\r
SetCurrentDirAsDirHist();\r
\r
+ // 外部アプリケーションへドロップ後にローカル側のファイル一覧に作業フォルダが表示されるバグ対策\r
+ SuppressRefresh = 0;\r
+ GetLocalDirForWnd();\r
+ // 同時接続対応\r
+ EnableUserOpe();\r
+\r
remoteFileListBase = FileListBase; // あとでフリーすること\r
remoteFileListBaseNoExpand = FileListBaseNoExpand; // あとでフリーすること\r
strncpy_s(remoteFileDir, sizeof(remoteFileDir), TmpDir, _TRUNCATE);\r
if(hWnd == hWndListRemote)\r
{\r
if(AskConnecting() == YES)\r
- UpLoadDragProc(wParam);\r
+ UploadDragProc(wParam);\r
}\r
else if(hWnd == hWndListLocal)\r
{\r
}\r
\r
/* ファイル名の配列を作成する */\r
- // TODO: GlobalAllocが返すのはメモリポインタではなくハンドルだが実際は同じ値\r
FileNameList = (char **)GlobalAlloc(GPTR,sizeof(char *) * filenum);\r
if(FileNameList == NULL){\r
abort();\r
LV_COLUMN LvCol;\r
int i;\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvCol, 0, sizeof(LV_COLUMN));\r
+\r
for(i = 0; i <= 3; i++)\r
{\r
LvCol.mask = LVCF_WIDTH;\r
\r
while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)\r
{\r
- if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)\r
+ if((ListType = AnalyzeFileInfo(Str)) != LIST_UNKNOWN)\r
{\r
- if((Type = ResolvFileInfo(Str, ListType, Buf, &Size, &Time, &Attr, Owner, &Link, &InfoExist)) != NODE_NONE)\r
+ if((Type = ResolveFileInfo(Str, ListType, Buf, &Size, &Time, &Attr, Owner, &Link, &InfoExist)) != NODE_NONE)\r
{\r
if(AskFilterStr(Buf, Type) == YES)\r
{\r
int i;\r
char Cur[FMAX_PATH+1];\r
SHFILEINFO FileInfo;\r
- if(AskDispFileIcon() == YES)\r
+ if(DispFileIcon == YES)\r
{\r
SendMessage(hWndListLocal, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)NULL);\r
ShowWindow(hWndListLocal, SW_SHOW);\r
SetYenTail(Cur);\r
strcat(Cur, Pos->File);\r
}\r
- if(SHGetFileInfoM(Cur, 0, &FileInfo, sizeof(SHFILEINFO), SHGFI_SMALLICON | SHGFI_ICON) != 0)\r
+ if(SHGetFileInfo(Cur, 0, &FileInfo, sizeof(SHFILEINFO), SHGFI_SMALLICON | SHGFI_ICON) != 0)\r
{\r
if(ImageList_AddIcon(ListImgFileIcon, FileInfo.hIcon) >= 0)\r
{\r
SetLocalDirHist(Scan);\r
DispLocalFreeSpace(Scan);\r
\r
+ // ローカル側自動更新\r
+ if(ChangeNotification != INVALID_HANDLE_VALUE)\r
+ FindCloseChangeNotification(ChangeNotification);\r
+ ChangeNotification = FindFirstChangeNotification(Scan, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE);\r
+\r
/* ディレクトリ／ファイル */\r
\r
SetYenTail(Scan);\r
if(DispDrives)\r
{\r
GetLogicalDriveStrings(FMAX_PATH, Scan);\r
- NoDrives = LoadHideDriveListRegistory();\r
+ NoDrives = LoadHideDriveListRegistry();\r
\r
Pos = Scan;\r
while(*Pos != NUL)\r
\r
if((Sort & SORT_GET_ORD) == SORT_ASCENT)\r
{\r
- if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
- ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0)) ||\r
+ // 読みにくいのでリファクタリング\r
+// if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+// ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0)) ||\r
+//#if defined(HAVE_TANDEM)\r
+// ((AskHostType() == HTYPE_TANDEM) &&\r
+// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+// ((Cmp = Attr - Pos->Attr) < 0)) ||\r
+//#endif\r
+// (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
+// ((Cmp = Size - Pos->Size) < 0)) ||\r
+// (((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
+// ((Cmp = CompareFileTime(Time, &Pos->Time)) < 0)))\r
+// {\r
+// break;\r
+// }\r
+ if(((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+ ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0))\r
+ break;\r
#if defined(HAVE_TANDEM)\r
- ((AskHostType() == HTYPE_TANDEM) &&\r
- ((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
- ((Cmp = Attr - Pos->Attr) < 0)) ||\r
+ if((AskHostType() == HTYPE_TANDEM) &&\r
+ ((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+ ((Cmp = Attr - Pos->Attr) < 0))\r
+ break;\r
#endif\r
- (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
- ((Cmp = Size - Pos->Size) < 0)) ||\r
- (((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
- ((Cmp = CompareFileTime(Time, &Pos->Time)) < 0)))\r
- {\r
+ if(((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
+ ((Cmp = Size - Pos->Size) < 0))\r
+ break;\r
+ if(((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
+ ((Cmp = CompareFileTime(Time, &Pos->Time)) < 0))\r
break;\r
- }\r
\r
if(((Sort & SORT_MASK_ORD) == SORT_NAME) || (Cmp == 0))\r
{\r
}\r
else\r
{\r
+ // 読みにくいのでリファクタリング\r
+// if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+// ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) > 0)) ||\r
+//#if defined(HAVE_TANDEM)\r
+// ((AskHostType() == HTYPE_TANDEM) &&\r
+// ((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
+// ((Cmp = Attr - Pos->Attr) > 0)) ||\r
+//#endif\r
+// (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
+// ((Cmp = Size - Pos->Size) > 0)) ||\r
+// (((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
+// ((Cmp = CompareFileTime(Time, &Pos->Time)) > 0)))\r
+// {\r
+// break;\r
+// }\r
if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
- ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) > 0)) ||\r
+ ((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) > 0)))\r
+ break;\r
#if defined(HAVE_TANDEM)\r
- ((AskHostType() == HTYPE_TANDEM) &&\r
+ if(((AskHostType() == HTYPE_TANDEM) &&\r
((Sort & SORT_MASK_ORD) == SORT_EXT) &&\r
- ((Cmp = Attr - Pos->Attr) > 0)) ||\r
+ ((Cmp = Attr - Pos->Attr) > 0)))\r
+ break;\r
#endif\r
- (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
- ((Cmp = Size - Pos->Size) > 0)) ||\r
- (((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
- ((Cmp = CompareFileTime(Time, &Pos->Time)) > 0)))\r
- {\r
+ if(((Sort & SORT_MASK_ORD) == SORT_SIZE) &&\r
+ ((Cmp = Size - Pos->Size) > 0))\r
+ break;\r
+ if(((Sort & SORT_MASK_ORD) == SORT_DATE) &&\r
+ ((Cmp = CompareFileTime(Time, &Pos->Time)) > 0))\r
break;\r
- }\r
\r
if(((Sort & SORT_MASK_ORD) == SORT_NAME) || (Cmp == 0))\r
{\r
if(Pos == -1)\r
Pos = SendMessage(hWnd, LVM_GETITEMCOUNT, 0, 0);\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
/* アイコン/ファイル名 */\r
LvItem.mask = LVIF_TEXT | LVIF_IMAGE;\r
LvItem.iItem = Pos;\r
else\r
LvItem.iImage = 4;\r
// ファイルアイコン表示対応\r
- if(AskDispFileIcon() == YES && hWnd == GetLocalHwnd())\r
+ if(DispFileIcon == YES && hWnd == GetLocalHwnd())\r
LvItem.iImage = ImageId + 5;\r
LvItem.iItem = SendMessage(hWnd, LVM_INSERTITEM, 0, (LPARAM)&LvItem);\r
\r
/* 日付/時刻 */\r
- FileTime2TimeString(Time, Tmp, DISPFORM_LEGACY, InfoExist);\r
+ // タイムスタンプのバグ修正\r
+// FileTime2TimeString(Time, Tmp, DISPFORM_LEGACY, InfoExist);\r
+ FileTime2TimeString(Time, Tmp, DISPFORM_LEGACY, InfoExist, DispTimeSeconds);\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 1;\r
#else\r
if(InfoExist & FINFO_ATTR)\r
#endif\r
- AttrValue2String(Attr, Tmp);\r
+ // ファイルの属性を数字で表示\r
+// AttrValue2String(Attr, Tmp);\r
+ AttrValue2String(Attr, Tmp, DispPermissionsNumber);\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 4;\r
* なし\r
*----------------------------------------------------------------------------*/\r
\r
-void SelectFileInList(HWND hWnd, int Type)\r
+// ローカル側自動更新\r
+//void SelectFileInList(HWND hWnd, int Type)\r
+void SelectFileInList(HWND hWnd, int Type, FILELIST *Base)\r
{\r
int Win;\r
int WinDst;\r
FILETIME Time2;\r
int Find;\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
Win = WIN_LOCAL;\r
WinDst = WIN_REMOTE;\r
if(hWnd == GetRemoteHwnd())\r
}\r
}\r
break;\r
+\r
+ // ローカル側自動更新\r
+ case SELECT_LIST :\r
+ for(i = 0; i < Num; i++)\r
+ {\r
+ LvItem.state = 0;\r
+ GetNodeName(Win, i, Name, FMAX_PATH);\r
+ if(SearchFileList(Name, Base, COMP_STRICT) != NULL)\r
+ LvItem.state = LVIS_SELECTED;\r
+ LvItem.mask = LVIF_STATE;\r
+ LvItem.iItem = i;\r
+ LvItem.stateMask = LVIS_SELECTED;\r
+ LvItem.iSubItem = 0;\r
+ SendMessage(hWnd, LVM_SETITEMSTATE, i, (LPARAM)&LvItem);\r
+ }\r
+ break;\r
}\r
return;\r
}\r
LV_ITEM LvItem;\r
char *Title;\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
Win = WIN_LOCAL;\r
Title = MSGJPN050;\r
if(hWnd == GetRemoteHwnd())\r
}\r
\r
\r
+// ローカル側自動更新\r
+int GetHotSelected(int Win, char *Fname)\r
+{\r
+ HWND hWnd;\r
+ int Pos;\r
+\r
+ hWnd = GetLocalHwnd();\r
+ if(Win == WIN_REMOTE)\r
+ hWnd = GetRemoteHwnd();\r
+\r
+ Pos = SendMessage(hWnd, LVM_GETNEXTITEM, (WPARAM)-1, (LPARAM)MAKELPARAM(LVNI_FOCUSED, 0));\r
+ if(Pos != -1)\r
+ GetNodeName(Win, Pos, Fname, FMAX_PATH);\r
+\r
+ return Pos;\r
+}\r
+\r
+int SetHotSelected(int Win, char *Fname)\r
+{\r
+ HWND hWnd;\r
+ int i;\r
+ int Num;\r
+ char Name[FMAX_PATH+1];\r
+ LV_ITEM LvItem;\r
+ int Pos;\r
+\r
+ hWnd = GetLocalHwnd();\r
+ if(Win == WIN_REMOTE)\r
+ hWnd = GetRemoteHwnd();\r
+\r
+ Num = GetItemCount(Win);\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
+ Pos = -1;\r
+ for(i = 0; i < Num; i++)\r
+ {\r
+ LvItem.state = 0;\r
+ GetNodeName(Win, i, Name, FMAX_PATH);\r
+ if(_mbscmp(Fname, Name) == 0)\r
+ {\r
+ Pos = i;\r
+ LvItem.state = LVIS_FOCUSED;\r
+ }\r
+ LvItem.mask = LVIF_STATE;\r
+ LvItem.iItem = i;\r
+ LvItem.stateMask = LVIS_FOCUSED;\r
+ LvItem.iSubItem = 0;\r
+ SendMessage(hWnd, LVM_SETITEMSTATE, i, (LPARAM)&LvItem);\r
+ }\r
+\r
+ return Pos;\r
+}\r
+\r
/*----- 指定された名前のアイテムを探す ----------------------------------------\r
*\r
* Parameter\r
if(Win == WIN_REMOTE)\r
hWnd = GetRemoteHwnd();\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&FindInfo, 0, sizeof(LV_FINDINFO));\r
FindInfo.flags = LVFI_STRING;\r
FindInfo.psz = Name;\r
return(SendMessage(hWnd, LVM_FINDITEM, -1, (LPARAM)&FindInfo));\r
if(Win == WIN_REMOTE)\r
hWnd = GetRemoteHwnd();\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 0;\r
if(Win == WIN_REMOTE)\r
hWnd = GetRemoteHwnd();\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 1;\r
if(Win == WIN_REMOTE)\r
hWnd = GetRemoteHwnd();\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 2;\r
Ret = NO;\r
if(Win == WIN_REMOTE)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
#if defined(HAVE_TANDEM)\r
if(Win == WIN_REMOTE)\r
hWnd = GetRemoteHwnd();\r
\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 2;\r
}\r
\r
\r
+/*----- 指定位置のアイテムのイメージ番号を返す ----------------------------------------\r
+*\r
+* Parameter\r
+* int Win : ウインドウ番号 (WIN_xxx)\r
+* int Pos : 位置\r
+*\r
+* Return Value\r
+* int イメージ番号\r
+* 4 Symlink\r
+*----------------------------------------------------------------------------*/\r
+static int GetImageIndex(int Win, int Pos)\r
+{\r
+ HWND hWnd;\r
+ LV_ITEM LvItem;\r
+\r
+ hWnd = GetLocalHwnd();\r
+ if(Win == WIN_REMOTE)\r
+ hWnd = GetRemoteHwnd();\r
+\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
+ LvItem.mask = LVIF_IMAGE;\r
+ LvItem.iItem = Pos;\r
+ LvItem.iSubItem = 0;\r
+ SendMessage(hWnd, LVM_GETITEM, 0, (LPARAM)&LvItem);\r
+ return LvItem.iImage;\r
+}\r
+\r
+\r
/*----- 指定位置のアイテムのオーナ名を返す ------------------------------------\r
*\r
* Parameter\r
strcpy(Buf, "");\r
if(Win == WIN_REMOTE)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&LvItem, 0, sizeof(LV_ITEM));\r
LvItem.mask = LVIF_TEXT;\r
LvItem.iItem = Pos;\r
LvItem.iSubItem = 5;\r
* なし\r
*----------------------------------------------------------------------------*/\r
\r
-void MakeSelectedFileList(int Win, int Expand, int All, FILELIST **Base, int *CancelCheckWork)\r
+// ファイル一覧バグ修正\r
+//void MakeSelectedFileList(int Win, int Expand, int All, FILELIST **Base, int *CancelCheckWork)\r
+int MakeSelectedFileList(int Win, int Expand, int All, FILELIST **Base, int *CancelCheckWork)\r
{\r
+ // ファイル一覧バグ修正\r
+ int Sts;\r
int Pos;\r
char Name[FMAX_PATH+1];\r
char Cur[FMAX_PATH+1];\r
DWORD Attr;\r
int Ignore;\r
\r
+ // ファイル一覧バグ修正\r
+ Sts = FFFTP_SUCCESS;\r
if((All == YES) || (GetSelectedCount(Win) > 0))\r
{\r
/*===== カレントディレクトリのファイル =====*/\r
if((Node == NODE_FILE) ||\r
((Expand == NO) && (Node == NODE_DIR)))\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
Pkt.InfoExist = 0;\r
GetNodeName(Win, Pos, Pkt.File, FMAX_PATH);\r
if(GetNodeSize(Win, Pos, &Pkt.Size) == YES)\r
{\r
if(GetNodeType(Win, Pos) == NODE_DIR)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
GetNodeName(Win, Pos, Name, FMAX_PATH);\r
strcpy(Pkt.File, Name);\r
ReplaceAll(Pkt.File, '\\', '/');\r
\r
if(Ignore == NO)\r
{\r
- Pkt.Node = NODE_DIR;\r
+// Pkt.Node = NODE_DIR;\r
+ if(GetImageIndex(Win, Pos) == 4) // symlink\r
+ Pkt.Node = NODE_FILE;\r
+ else\r
+ Pkt.Node = NODE_DIR;\r
Pkt.Attr = 0;\r
Pkt.Size = 0;\r
memset(&Pkt.Time, 0, sizeof(FILETIME));\r
AddFileList(&Pkt, Base);\r
\r
- if(Win == WIN_LOCAL)\r
- MakeLocalTree(Name, Base);\r
- else\r
- {\r
- AskRemoteCurDir(Cur, FMAX_PATH);\r
-\r
- if((AskListCmdMode() == NO) &&\r
- (AskUseNLST_R() == YES))\r
- MakeRemoteTree1(Name, Cur, Base, CancelCheckWork);\r
+// if(Win == WIN_LOCAL)\r
+// MakeLocalTree(Name, Base);\r
+// else\r
+// {\r
+// AskRemoteCurDir(Cur, FMAX_PATH);\r
+//\r
+// if((AskListCmdMode() == NO) &&\r
+// (AskUseNLST_R() == YES))\r
+// MakeRemoteTree1(Name, Cur, Base, CancelCheckWork);\r
+// else\r
+// MakeRemoteTree2(Name, Cur, Base, CancelCheckWork);\r
+// }\r
+ if(GetImageIndex(Win, Pos) != 4) { // symlink\r
+ if(Win == WIN_LOCAL)\r
+ // ファイル一覧バグ修正\r
+// MakeLocalTree(Name, Base);\r
+ {\r
+ if(MakeLocalTree(Name, Base) == FFFTP_FAIL)\r
+ Sts = FFFTP_FAIL;\r
+ }\r
else\r
- MakeRemoteTree2(Name, Cur, Base, CancelCheckWork);\r
+ {\r
+ AskRemoteCurDir(Cur, FMAX_PATH);\r
+\r
+ if((AskListCmdMode() == NO) &&\r
+ (AskUseNLST_R() == YES))\r
+ // ファイル一覧バグ修正\r
+// MakeRemoteTree1(Name, Cur, Base, CancelCheckWork);\r
+ {\r
+ if(MakeRemoteTree1(Name, Cur, Base, CancelCheckWork) == FFFTP_FAIL)\r
+ Sts = FFFTP_FAIL;\r
+ }\r
+ else\r
+ // ファイル一覧バグ修正\r
+// MakeRemoteTree2(Name, Cur, Base, CancelCheckWork);\r
+ {\r
+ if(MakeRemoteTree2(Name, Cur, Base, CancelCheckWork) == FFFTP_FAIL)\r
+ Sts = FFFTP_FAIL;\r
+ }\r
\r
//DispListList(*Base, "LIST");\r
\r
+ }\r
}\r
}\r
}\r
}\r
}\r
}\r
- return;\r
+ // ファイル一覧バグ修正\r
+// return;\r
+ return(Sts);\r
}\r
\r
\r
\r
if((GetFileAttributes(Name) & FILE_ATTRIBUTE_DIRECTORY) == 0)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
Pkt.Node = NODE_FILE;\r
strcpy(Pkt.File, GetFileName(Name));\r
\r
\r
if(GetFileAttributes(Name) & FILE_ATTRIBUTE_DIRECTORY)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
Pkt.Node = NODE_DIR;\r
strcpy(Pkt.File, GetFileName(Name));\r
AddFileList(&Pkt, Base);\r
* NLST -alLR を使う\r
*----------------------------------------------------------------------------*/\r
\r
-static void MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
+// ファイル一覧バグ修正\r
+//static void MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
+static int MakeRemoteTree1(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
{\r
+ // ファイル一覧バグ修正\r
+ int Ret;\r
int Sts;\r
\r
+ // ファイル一覧バグ修正\r
+ Ret = FFFTP_FAIL;\r
if(DoCWD(Path, NO, NO, NO) == FTP_COMPLETE)\r
{\r
/* サブフォルダも含めたリストを取得 */\r
DoCWD(Cur, NO, NO, NO);\r
\r
if(Sts == FTP_COMPLETE)\r
+ // ファイル一覧バグ修正\r
+// AddRemoteTreeToFileList(999, Path, RDIR_NLST, Base);\r
+ {\r
AddRemoteTreeToFileList(999, Path, RDIR_NLST, Base);\r
+ Ret = FFFTP_SUCCESS;\r
+ }\r
}\r
- return;\r
+ // ファイル一覧バグ修正\r
+// return;\r
+ return(Ret);\r
}\r
\r
\r
* 各フォルダに移動してリストを取得\r
*----------------------------------------------------------------------------*/\r
\r
-static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
+// ファイル一覧バグ修正\r
+//static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
+static int MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelCheckWork)\r
{\r
+ // ファイル一覧バグ修正\r
+ int Ret;\r
int Sts;\r
FILELIST *CurList;\r
FILELIST *Pos;\r
FILELIST Pkt;\r
\r
+ // ファイル一覧バグ修正\r
+ Ret = FFFTP_FAIL;\r
/* VAX VMS は CWD xxx/yyy という指定ができないので */\r
/* CWD xxx, Cwd yyy と複数に分ける */\r
if(AskHostType() != HTYPE_VMS)\r
AddRemoteTreeToFileList(999, Path, RDIR_CWD, &CurList);\r
CopyTmpListToFileList(Base, CurList);\r
\r
+ // ファイル一覧バグ修正\r
+ Ret = FFFTP_SUCCESS;\r
+\r
Pos = CurList;\r
while(Pos != NULL)\r
{\r
if(Pos->Node == NODE_DIR)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
/* まずディレクトリ名をセット */\r
strcpy(Pkt.File, Pos->File);\r
- Pkt.Node = NODE_DIR;\r
+// Pkt.Node = NODE_DIR;\r
+ Pkt.Link = Pos->Link;\r
+ if(Pkt.Link == YES)\r
+ Pkt.Node = NODE_FILE;\r
+ else\r
+ Pkt.Node = NODE_DIR;\r
Pkt.Size = 0;\r
Pkt.Attr = 0;\r
memset(&Pkt.Time, 0, sizeof(FILETIME));\r
AddFileList(&Pkt, Base);\r
\r
/* そのディレクトリの中を検索 */\r
- MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork);\r
+// MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork);\r
+ if(Pkt.Link == NO)\r
+ // ファイル一覧バグ修正\r
+// MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork);\r
+ {\r
+ if(MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork) == FFFTP_FAIL)\r
+ Ret = FFFTP_FAIL;\r
+ }\r
}\r
Pos = Pos->Next;\r
}\r
DeleteFileList(&CurList);\r
}\r
}\r
- return;\r
+ // ファイル一覧バグ修正\r
+// return;\r
+ return(Ret);\r
}\r
\r
\r
\r
while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)\r
{\r
- if((ListType = AnalizeFileInfo(Str)) == LIST_UNKNOWN)\r
+ if((ListType = AnalyzeFileInfo(Str)) == LIST_UNKNOWN)\r
{\r
if(MakeDirPath(Str, ListType, Path, Dir) == FFFTP_SUCCESS)\r
{\r
if(IncDir == RDIR_NLST)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
strcpy(Pkt.File, Dir);\r
Pkt.Node = NODE_DIR;\r
Pkt.Size = 0;\r
}\r
else\r
{\r
- Node = ResolvFileInfo(Str, ListType, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);\r
+ Node = ResolveFileInfo(Str, ListType, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);\r
\r
if(AskFilterStr(Name, Node) == YES)\r
{\r
if((Node == NODE_FILE) ||\r
((IncDir == RDIR_CWD) && (Node == NODE_DIR)))\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
strcpy(Pkt.File, Dir);\r
if(strlen(Pkt.File) > 0)\r
SetSlashTail(Pkt.File);\r
* なし\r
*----------------------------------------------------------------------------*/\r
\r
-static void MakeLocalTree(char *Path, FILELIST **Base)\r
+// ファイル一覧バグ修正\r
+//static void MakeLocalTree(char *Path, FILELIST **Base)\r
+static int MakeLocalTree(char *Path, FILELIST **Base)\r
{\r
+ // ファイル一覧バグ修正\r
+ int Sts;\r
char Src[FMAX_PATH+1];\r
HANDLE fHnd;\r
WIN32_FIND_DATA FindBuf;\r
FILELIST Pkt;\r
SYSTEMTIME TmpStime;\r
\r
+ // ファイル一覧バグ修正\r
+ Sts = FFFTP_FAIL;\r
+\r
strcpy(Src, Path);\r
SetYenTail(Src);\r
strcat(Src, "*");\r
{\r
if(AskFilterStr(FindBuf.cFileName, NODE_FILE) == YES)\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
strcpy(Pkt.File, Path);\r
SetSlashTail(Pkt.File);\r
strcat(Pkt.File, FindBuf.cFileName);\r
Pkt.Attr = 0;\r
Pkt.Time = FindBuf.ftLastWriteTime;\r
FileTimeToSystemTime(&Pkt.Time, &TmpStime);\r
- TmpStime.wSecond = 0;\r
+ // タイムスタンプのバグ修正\r
+// TmpStime.wSecond = 0;\r
+ if(DispTimeSeconds == NO)\r
+ TmpStime.wSecond = 0;\r
TmpStime.wMilliseconds = 0;\r
SystemTimeToFileTime(&TmpStime, &Pkt.Time);\r
AddFileList(&Pkt, Base);\r
\r
if((fHnd = FindFirstFileAttr(Src, &FindBuf, DispIgnoreHide)) != INVALID_HANDLE_VALUE)\r
{\r
+ // ファイル一覧バグ修正\r
+ Sts = FFFTP_SUCCESS;\r
do\r
{\r
if((FindBuf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&\r
(strcmp(FindBuf.cFileName, ".") != 0) &&\r
(strcmp(FindBuf.cFileName, "..") != 0))\r
{\r
+ // 変数が未初期化のバグ修正\r
+ memset(&Pkt, 0, sizeof(FILELIST));\r
+\r
strcpy(Src, Path);\r
SetYenTail(Src);\r
strcat(Src, FindBuf.cFileName);\r
memset(&Pkt.Time, 0, sizeof(FILETIME));\r
AddFileList(&Pkt, Base);\r
\r
- MakeLocalTree(Src, Base);\r
+ // ファイル一覧バグ修正\r
+// MakeLocalTree(Src, Base);\r
+ if(MakeLocalTree(Src, Base) == FFFTP_FAIL)\r
+ Sts = FFFTP_FAIL;\r
}\r
}\r
while(FindNextFileAttr(fHnd, &FindBuf, DispIgnoreHide) == TRUE);\r
FindClose(fHnd);\r
}\r
- return;\r
+ // ファイル一覧バグ修正\r
+// return;\r
+ return(Sts);\r
}\r
\r
\r
* int リストタイプ (LIST_xxx)\r
*----------------------------------------------------------------------------*/\r
\r
-static int AnalizeFileInfo(char *Str)\r
+static int AnalyzeFileInfo(char *Str)\r
{\r
int Ret;\r
char Tmp[FMAX_PATH+1];\r
Ret = LIST_SHIBASOKU;\r
else\r
{\r
+ // MLSD対応\r
+ if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)\r
+ {\r
+ _strlwr(Tmp);\r
+ if(strstr(Tmp, "type=") != NULL)\r
+ {\r
+ if(FindField2(Str, Tmp, ';', 1, NO) == FFFTP_SUCCESS && FindField2(Str, Tmp, '=', 1, NO) == FFFTP_SUCCESS)\r
+ {\r
+ Ret = LIST_MLSD;\r
+ }\r
+ }\r
+ }\r
+\r
/* 以下のフォーマットをチェック */\r
/* LIST_UNIX_10, LIST_UNIX_20, LIST_UNIX_12, LIST_UNIX_22, LIST_UNIX_50, LIST_UNIX_60 */\r
/* MELCOM80 */\r
\r
- if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)\r
+ // MLSD対応\r
+// if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)\r
+ if(Ret == LIST_UNKNOWN && FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)\r
{\r
/* MELCOM80は "d rwxrwxrwx" のようにスペースが空いている */\r
Flag1 = NO;\r
\r
if((Ret != LIST_UNKNOWN) && (Flag1 == YES))\r
Ret |= LIST_MELCOM;\r
+\r
+ // uClinux\r
+ if((Ret == LIST_UNKNOWN) &&\r
+ (FindField(Str, Tmp, 5+Add1, NO) == FFFTP_SUCCESS))\r
+ {\r
+ Ret = LIST_UNIX_17;\r
+ }\r
}\r
}\r
\r
}\r
}\r
\r
+ // Windows Server 2008 R2\r
+ if(Ret == LIST_UNKNOWN)\r
+ {\r
+ if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
+ (CheckHHMMformat(Tmp) == YES))\r
+ {\r
+ if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
+ ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
+ {\r
+ if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)\r
+ {\r
+ if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
+ (CheckMMDDYYYYformat(Tmp, NUL) != 0))\r
+ {\r
+ Ret = LIST_DOS_5;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
/* 以下のフォーマットをチェック */\r
/* LIST_CHAMELEON */\r
\r
}\r
#endif\r
\r
- // MLSD対応\r
- if(Ret == LIST_UNKNOWN)\r
- {\r
- if(FindField2(Str, Tmp, ';', 1, NO) == FFFTP_SUCCESS && FindField2(Str, Tmp, '=', 1, NO) == FFFTP_SUCCESS)\r
- {\r
- Ret = LIST_MLSD;\r
- }\r
- }\r
}\r
\r
DoPrintf("ListType=%d", Ret);\r
}\r
\r
\r
+// Windows Server 2008 R2\r
+static int CheckMMDDYYYYformat(char *Str, char Sym)\r
+{\r
+ int Ret;\r
+\r
+ Ret = NO;\r
+ if((strlen(Str) == 10) &&\r
+ (IsDigitSym(Str[0], Sym) != 0) && (IsDigitSym(Str[1], Sym) != 0) &&\r
+ (IsDigit(Str[2]) == 0) &&\r
+ (IsDigitSym(Str[3], Sym) != 0) && (IsDigitSym(Str[4], Sym) != 0) &&\r
+ (IsDigit(Str[5]) == 0) &&\r
+ (IsDigitSym(Str[6], Sym) != 0) && (IsDigitSym(Str[7], Sym) != 0) &&\r
+ (IsDigitSym(Str[8], Sym) != 0) && (IsDigitSym(Str[9], Sym) != 0))\r
+ {\r
+ Ret = YES; \r
+ }\r
+ return(Ret);\r
+}\r
+\r
+\r
/*----- ファイル情報からファイル名、サイズなどを取り出す ----------------------\r
*\r
* Parameter\r
* int 種類 (NODE_xxxx)\r
*----------------------------------------------------------------------------*/\r
\r
-static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist)\r
+static int ResolveFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist)\r
{\r
SYSTEMTIME sTime;\r
SYSTEMTIME sTimeNow;\r
}\r
break;\r
\r
+ // Windows Server 2008 R2\r
+ case LIST_DOS_5 :\r
+ *InfoExist |= (FINFO_TIME | FINFO_DATE | FINFO_SIZE);\r
+\r
+ /* 日付 */\r
+ FindField(Str, Buf, 0, NO);\r
+ sTime.wMonth = atoi(Buf);\r
+ sTime.wDay = atoi(Buf+3);\r
+ sTime.wYear = atoi(Buf+6);\r
+\r
+ /* 時刻 */\r
+ FindField(Str, Buf, 1, NO);\r
+ sTime.wHour = atoi(Buf);\r
+ sTime.wMinute = atoi(Buf+3);\r
+ sTime.wSecond = 0;\r
+ sTime.wMilliseconds = 0;\r
+ if(_strnicmp(Buf+5, "AM", 2) == 0)\r
+ {\r
+ if(sTime.wHour == 12)\r
+ sTime.wHour = 0;\r
+ }\r
+ else if(_strnicmp(Buf+5, "PM", 2) == 0)\r
+ {\r
+ if(sTime.wHour != 12)\r
+ sTime.wHour += 12;\r
+ }\r
+ SystemTimeToFileTime(&sTime, Time);\r
+ SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
+\r
+ /* サイズ */\r
+ FindField(Str, Buf, 2, NO);\r
+ *Size = _atoi64(Buf);\r
+\r
+ /* 名前 */\r
+ if(FindField(Str, Fname, 3, YES) == FFFTP_SUCCESS)\r
+ {\r
+ Ret = NODE_FILE;\r
+ if(Buf[0] == '<')\r
+ Ret = NODE_DIR;\r
+ }\r
+ break;\r
+\r
case LIST_OS2 :\r
*InfoExist |= (FINFO_DATE | FINFO_SIZE);\r
\r
// 不完全な実装のホストが存在するため以下の形式も許容\r
// fact1=value1;fact2=value2;fact3=value3 filename\r\n\r
// fact1=value1;fact2=value2;fact3=value3;filename\r\n\r
+ // SymlinkはRFC3659の7.7.4. A More Complex Exampleに\r
+ // よるとtype=OS.unix=slink:(target)だが\r
+ // ProFTPDはtype=OS.unix=symlink:(target)となる\r
case LIST_MLSD:\r
{\r
int i = 0;\r
char Fact[FMAX_PATH + 1];\r
char Name[FMAX_PATH + 1];\r
char Value[FMAX_PATH + 1];\r
+ char Value2[FMAX_PATH + 1];\r
char* pFileName;\r
strncpy(StrBuf, Str, FMAX_PATH * 2);\r
StrBuf[FMAX_PATH * 2] = '\0';\r
Ret = NODE_DIR;\r
else if(_stricmp(Value, "file") == 0)\r
Ret = NODE_FILE;\r
+ else if(_stricmp(Value, "OS.unix") == 0)\r
+ if(FindField2(Fact, Value2, '=', 2, NO) == FFFTP_SUCCESS)\r
+ if(_stricmp(Value2, "symlink") == 0 || _stricmp(Value2, "slink") == 0) { // ProFTPD is symlink. A example of RFC3659 is slink.\r
+ Ret = NODE_DIR;\r
+ *Link = YES;\r
+ }\r
}\r
else if(_stricmp(Name, "size") == 0)\r
{\r
// case LIST_MELCOM :\r
// linux-ftpd\r
case LIST_UNIX_16 :\r
+ // uClinux\r
+ case LIST_UNIX_17 :\r
default:\r
/* offsはサイズの位置, offs=0はカラム4 */\r
offs = 0;\r
(ListType == LIST_UNIX_73) ||\r
(ListType == LIST_UNIX_16))\r
offs2 = -1;\r
+ // uClinux\r
+ if(ListType == LIST_UNIX_17)\r
+ offs2 = -3;\r
\r
/* offs3はオーナ名の位置 */\r
offs3 = 0;\r
(ListType == LIST_UNIX_74) ||\r
(ListType == LIST_UNIX_75))\r
Flag2 = 1;\r
+ // uClinux\r
+ if(ListType == LIST_UNIX_17)\r
+ Flag2 = -1;\r
\r
*InfoExist |= (FINFO_DATE | FINFO_SIZE | FINFO_ATTR);\r
\r
}\r
}\r
}\r
+ // uClinux\r
+ else if(Flag2 == -1)\r
+ {\r
+ *InfoExist &= ~(FINFO_DATE | FINFO_TIME);\r
+ }\r
else\r
{\r
/* LIST_UNIX_?4, LIST_UNIX_?5 の時 */\r
\r
// UTF-8対応\r
// ファイル一覧から漢字コードを推測\r
-// 優先度はUTF-8、Shift_JIS、EUC、JISの順\r
+// å\84ªå\85\88度ã\81¯UTF-8ã\80\81Shift_JISã\80\81EUCã\80\81JISã\80\81UTF-8 HFS+ã\81®é \86\r
int AnalyzeNameKanjiCode(int Num)\r
{\r
char Str[FMAX_PATH+1];\r
int PointJIS;\r
int PointEUC;\r
int PointUTF8N;\r
+ int PointUTF8HFSX;\r
char* p;\r
+ CODECONVINFO cInfo1;\r
+ CODECONVINFO cInfo2;\r
+ char Buf[FMAX_PATH+1];\r
\r
NameKanjiCode = KANJI_AUTO;\r
Point = 0;\r
PointJIS = 0;\r
PointEUC = 0;\r
PointUTF8N = 0;\r
+ PointUTF8HFSX = 0;\r
MakeCacheFileName(Num, Str);\r
if((fd = fopen(Str, "rb")) != NULL)\r
{\r
while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)\r
{\r
- if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)\r
+ if((ListType = AnalyzeFileInfo(Str)) != LIST_UNKNOWN)\r
{\r
strcpy(Name, "");\r
- Node = ResolvFileInfo(Str, ListType | LIST_RAW_NAME, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);\r
+ Node = ResolveFileInfo(Str, ListType | LIST_RAW_NAME, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);\r
p = Name;\r
while(*p != '\0')\r
{\r
}\r
if(!p)\r
{\r
+ // ASCII文字の範囲外\r
if(!CheckStringM(Name))\r
- PointUTF8N++;\r
- else\r
{\r
- switch(CheckKanjiCode(Name, strlen(Name), KANJI_SJIS))\r
- {\r
- case KANJI_SJIS:\r
- PointSJIS++;\r
- break;\r
- case KANJI_JIS:\r
- PointJIS++;\r
- break;\r
- case KANJI_EUC:\r
- PointEUC++;\r
- break;\r
- }\r
+ InitCodeConvInfo(&cInfo1);\r
+ cInfo1.KanaCnv = NO;\r
+ cInfo1.Str = Name;\r
+ cInfo1.StrLen = strlen(Name);\r
+ cInfo1.Buf = Buf;\r
+ cInfo1.BufSize = FMAX_PATH;\r
+ cInfo2 = cInfo1;\r
+ ConvUTF8NtoUTF8HFSX(&cInfo1);\r
+ ConvUTF8HFSXtoUTF8N(&cInfo2);\r
+ if(cInfo1.OutLen > (int)strlen(Name))\r
+ PointUTF8N++;\r
+ else\r
+ PointUTF8HFSX++;\r
+ if(cInfo2.OutLen < (int)strlen(Name))\r
+ PointUTF8HFSX++;\r
+ else\r
+ PointUTF8N++;\r
+ }\r
+ switch(CheckKanjiCode(Name, strlen(Name), KANJI_SJIS))\r
+ {\r
+ case KANJI_SJIS:\r
+ PointSJIS++;\r
+ break;\r
+ case KANJI_EUC:\r
+ PointEUC++;\r
+ break;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ // ASCII文字の範囲内\r
+ switch(CheckKanjiCode(Name, strlen(Name), KANJI_SJIS))\r
+ {\r
+ case KANJI_JIS:\r
+ PointJIS++;\r
+ break;\r
}\r
}\r
}\r
}\r
fclose(fd);\r
}\r
+ if(PointUTF8HFSX >= Point)\r
+ {\r
+ NameKanjiCode = KANJI_UTF8HFSX;\r
+ Point = PointUTF8HFSX;\r
+ }\r
if(PointJIS >= Point)\r
{\r
NameKanjiCode = KANJI_JIS;\r
OSDN Git Service
