diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-10-13 20:37:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-10-13 20:37:41 +0200 |
| commit | 51b9026800cc799639ebbb76a09e1628300d3b4d (patch) | |
| tree | 8dd8af57ea80b93f7388a3f43a4e562900775937 | |
| parent | d4c26285caf9e15f0d5ecabf077f2befc493fafd (diff) | |
| download | vim-51b9026800cc799639ebbb76a09e1628300d3b4d.tar.gz | |
Problem: Opening a file on a network share is very slow.
Solution: When fixing file name case append "\*" to directory, server and
network share names. (David Anderson, John Beckett)
| -rw-r--r-- | src/os_win32.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 8c59e099..6bfcc2af 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2308,12 +2308,14 @@ fname_case( int len) { char szTrueName[_MAX_PATH + 2]; + char szTrueNameTemp[_MAX_PATH + 2]; char *ptrue, *ptruePrev; char *porig, *porigPrev; int flen; WIN32_FIND_DATA fb; HANDLE hFind; int c; + int slen; flen = (int)STRLEN(name); if (flen == 0 || flen > _MAX_PATH) @@ -2358,12 +2360,19 @@ fname_case( } *ptrue = NUL; + /* To avoid a slow failure append "\*" when searching a directory, + * server or network share. */ + STRCPY(szTrueNameTemp, szTrueName); + slen = strlen(szTrueNameTemp); + if (*porig == psepc && slen + 2 < _MAX_PATH) + STRCPY(szTrueNameTemp + slen, "\\*"); + /* Skip "", "." and "..". */ if (ptrue > ptruePrev && (ptruePrev[0] != '.' || (ptruePrev[1] != NUL && (ptruePrev[1] != '.' || ptruePrev[2] != NUL))) - && (hFind = FindFirstFile(szTrueName, &fb)) + && (hFind = FindFirstFile(szTrueNameTemp, &fb)) != INVALID_HANDLE_VALUE) { c = *porig; diff --git a/src/version.c b/src/version.c index bedc601c..dde80fae 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 27, +/**/ 26, /**/ 25, |