From 0ea7421ae6618fe8efe9e3afc8fdcf7a4d89739a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 11 Dec 2020 20:10:50 +0100 Subject: [PATCH] patch 8.2.2129: MS-Windows: Checking if a file name is absolute is slow Problem: MS-Windows: Checking if a file name is absolute is slow. Solution: Do not use mch_FullName(). (closes #7033) --- src/os_mswin.c | 22 +++++++--------------- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/os_mswin.c b/src/os_mswin.c index 80009533c..096ac1bc5 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -387,21 +387,13 @@ mch_FullName( int mch_isFullName(char_u *fname) { - // WinNT and later can use _MAX_PATH wide characters for a pathname, which - // means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is - // UTF-8. - char szName[_MAX_PATH * 3 + 1]; - - // A name like "d:/foo" and "//server/share" is absolute - if ((fname[0] && fname[1] == ':' && (fname[2] == '/' || fname[2] == '\\')) - || (fname[0] == fname[1] && (fname[0] == '/' || fname[0] == '\\'))) - return TRUE; - - // A name that can't be made absolute probably isn't absolute. - if (mch_FullName(fname, (char_u *)szName, sizeof(szName) - 1, FALSE) == FAIL) - return FALSE; - - return pathcmp((const char *)fname, (const char *)szName, -1) == 0; + // A name like "d:/foo" and "//server/share" is absolute. "d:foo" is not. + // Another way to check is to use mch_FullName() and see if the result is + // the same as the name or mch_FullName() fails. However, this has quite a + // bit of overhead, so let's not do that. + return ((ASCII_ISALPHA(fname[0]) && fname[1] == ':' + && (fname[2] == '/' || fname[2] == '\\')) + || (fname[0] == fname[1] && (fname[0] == '/' || fname[0] == '\\'))); } /* diff --git a/src/version.c b/src/version.c index 24a8390f6..9dae296a1 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2129, /**/ 2128, /**/ -- 2.40.0