Project: FAR manager
Revision: 1959
Author: drkns
Date: 29 Aug 2008 16:10:40
Changes:Mantis#475, Mantis#599
Files:modified: /trunk/unicode_far/execute.cpp (
try)
modified: /trunk/unicode_far/vbuild.m4 (
try)
modified: /trunk/unicode_far/changelog (
try)
modified: /trunk/unicode_far/fn.hpp (
try)
modified: /trunk/unicode_far/mix.cpp (
try)
Diff:
| ... | ...@@ -1276,7 +1276,7 @@ |
| 1276 | 1276 | }
|
| 1277 | 1277 | strFullPath += strExpandedStr;
|
| 1278 | 1278 | DWORD FileAttr=INVALID_FILE_ATTRIBUTES;
|
| 1279 | | if(wcspbrk(strExpandedStr,L"*?")) // |
| ... | ...@@ -1 +1 @@ |
| 0 | | m4_define(BUILD,550)m4_dnl |
| 0 | m4_define(BUILD,551)m4_dnl |
| ... | ...@@ -1,3 +1,11 @@ |
| 1 | drkns 29.08.2008 23:47:36 +0200 - build 551
|
| 2 |
|
| 3 | 1. Mantis#0000475: |
| ... | ...@@ -1042,6 +1042,7 @@ |
| 1042 | 1042 | BOOL IsDriveTypeCDROM(UINT DriveType);
|
| 1043 | 1043 | UINT FAR_GetDriveType(const wchar_t *RootDir,CDROM_DeviceCaps *caps=NULL,DWORD Detect=0);
|
| 1044 | 1044 |
|
| 1045 | bool PathPrefix(const wchar_t *Path);
|
| 1045 | 1046 | BOOL IsNetworkPath(const wchar_t *Path);
|
| 1046 | 1047 | BOOL IsLocalPath(const wchar_t *Path);
|
| 1047 | 1048 | BOOL IsLocalRootPath(const wchar_t *Path);
|
| ... | ...@@ -1300,7 +1300,6 @@ |
| 1300 | 1300 | );
|
| 1301 | 1301 | }
|
| 1302 | 1302 |
|
| 1303 | |
|
| 1304 | 1303 | BOOL IsNetworkPath(const wchar_t *Path)
|
| 1305 | 1304 | {
|
| 1306 | 1305 | return (Path && Path[0] == L'\\' && Path[1] == L'\\' && Path[2] != L'\\' && wcsrchr(Path+2,L'\\'));
|
| ... | ...@@ -1348,23 +1347,50 @@ |
| 1348 | 1347 | {
|
| 1349 | 1348 | if( !strPath.IsEmpty() )
|
| 1350 | 1349 | {
|
| 1351 | | if(((IsAlpha(strPath.At(0)) && strPath.At(1)==L':') || (strPath.At(0)==L'\\' && strPath.At(1)==L'\\')) && !IsLocalVolumePath(strPath))
|
| 1350 | if(((IsAlpha(strPath.At(0)) && strPath.At(1)==L':') || (strPath.At(0)==L'\\' && strPath.At(1)==L'\\')))
|
| 1352 | 1351 | {
|
| 1353 | 1352 | if(CheckFullPath)
|
| 1354 | 1353 | {
|
| 1355 | | ConvertNameToShort (strPath, strPath);
|
| 1356 | | ConvertNameToLong (strPath, strPath); //??? |
To list