From patchwork Mon Jan 16 14:08:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 44175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1211503wrn; Mon, 16 Jan 2023 06:09:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuBM0F5Yv2C/Qsg+DPw3PYmIz4PQJfFUGEAFT/w++6puElTKWTVZxk5accOOZN1neTBAiN5 X-Received: by 2002:a17:907:6d93:b0:86f:356e:ba43 with SMTP id sb19-20020a1709076d9300b0086f356eba43mr7765224ejc.18.1673878196102; Mon, 16 Jan 2023 06:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673878196; cv=none; d=google.com; s=arc-20160816; b=hPmRyoveMH9/p655Ffxz3ML1/H3gOgVhXbTIkS112wBt9xxhbXQYVaL1tE4PLJxPBe TrSBGX5rS8TPOwTOW92dpbNdW2d9Hre+pfgwr6RxURK54cvv481KPn+q6nsVhMqvhJwq 9MLlKqUImL2is3apEV9pPRmpeptVJIZrngLvSYoehfhL6CeNvWYYMRoBjQutwKgnUViI P59nncaV2G0LA1O5Gghuw5slJGprI9HST5+DfNSJxPULb+sz2sVE8l6p8bxDoKXpTIwl A6fm1rfU3Rawc6otQwSgV9AndcH6WcqA/SEAgu5OrczmFOw9QT2pnhCNP9XxGoaaI/az +9bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :user-agent:subject:to:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=jeUCm3jMwE7qShEBDQLdrcbXhVPRdNkk4rz2+zIPeY4=; b=q3/fWSqwqE2EqymPkEVCSA3A3WH8paN4EXI+quJbaKsjFL1zt1h0COPQtUMM1cseaa RCAtpQkgK/BE2ehGO6JxaqEVKG/Rd9t1/IgIlAkzROdT0XauFR/0XpYgxFLM9JETOodK ycff9zRm5ttLaHKdwcgKzJXVX0ZZsAtbeLp0Dss1bMeVaFV0o+J9hNNUQ6+hclUzHzGq nCp4cjykfp1NXlb1e2QFsLfO8LK78LxNdjUVOnwzYgyKrv6pTYtU55ZjybjcLkY1Ilzd wv0ubqefc4b3YYmyzdNjw0QhuiqFzE1/BSuKv3XNYr70VqxkNVc5nnMO/Ur+LDP7QCZw ro6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=qSNJjjhP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id go40-20020a1709070da800b0086d67b14b84si8705075ejc.496.2023.01.16.06.09.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 06:09:56 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=qSNJjjhP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5EB1D3858418 for ; Mon, 16 Jan 2023 14:09:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EB1D3858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673878183; bh=jeUCm3jMwE7qShEBDQLdrcbXhVPRdNkk4rz2+zIPeY4=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=qSNJjjhPPFhyc973vSf9w1eQHpCkyhIZfCx8pfkSBt/cP0U+f4xz+Cg7uGssQ6Vn8 /mvR5YHHGucGr0ARTrgYoz37S5biKcb4qdYUCyENSH2b/UZAT0xMzYOW1y+bh82+kT Bchn53XrdR9fH4VTtU3bTjUbxzU6rpJ51vKTmMP0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from latitanza.investici.org (latitanza.investici.org [82.94.249.234]) by sourceware.org (Postfix) with ESMTPS id 4EE943858D33 for ; Mon, 16 Jan 2023 14:08:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4EE943858D33 Received: from 1.mail-backend.investici.org (unknown [10.0.0.11]) by latitanza.investici.org (Postfix) with ESMTP id 4NwYm84bWLzGp8d for ; Mon, 16 Jan 2023 14:08:56 +0000 (UTC) Received: from 1.webmail.investici.org (localhost [127.0.0.1]) (Authenticated sender: i.nixman@autistici.org) by 1.mail-backend.investici.org (Postfix) with ESMTPA id 4NwYm83PDqz5spD for ; Mon, 16 Jan 2023 14:08:56 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 16 Jan 2023 14:08:56 +0000 To: Gcc Patches Subject: lrealpath() patch to fix symlinks resolution for win32 User-Agent: Roundcube Webmail Message-ID: X-Sender: i.nixman@autistici.org X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "i.nixman--- via Gcc-patches" From: "Li, Pan2 via Gcc-patches" Reply-To: i.nixman@autistici.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755188502972392668?= X-GMAIL-MSGID: =?utf-8?q?1755188502972392668?= hello, I just finished with https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108350 could anyone review and apply the attached patch please? GCC master was succesfully bootstrapped as x86_64-w64-mingw32. best! diff --git a/libiberty/lrealpath.c b/libiberty/lrealpath.c index 3c7053b0b70..8858619e854 100644 --- a/libiberty/lrealpath.c +++ b/libiberty/lrealpath.c @@ -68,8 +68,138 @@ extern char *canonicalize_file_name (const char *); /* cygwin has realpath, so it won't get here. */ # if defined (_WIN32) # define WIN32_LEAN_AND_MEAN -# include /* for GetFullPathName */ -# endif +# include /* for GetFullPathName/GetFinalPathNameByHandle/ + CreateFile/CloseHandle */ +# define WIN32_REPLACE_SLASHES(_ptr, _len) \ + for (unsigned i = 0; i != (_len); ++i) \ + if ((_ptr)[i] == '\\') (_ptr)[i] = '/'; + +# define WIN32_UNC_PREFIX "//?/UNC/" +# define WIN32_UNC_PREFIX_LEN (sizeof(WIN32_UNC_PREFIX)-1) +# define WIN32_IS_UNC_PREFIX(ptr) \ + (0 == memcmp(ptr, WIN32_UNC_PREFIX, WIN32_UNC_PREFIX_LEN)) + +# define WIN32_NON_UNC_PREFIX "//?/" +# define WIN32_NON_UNC_PREFIX_LEN (sizeof(WIN32_NON_UNC_PREFIX)-1) +# define WIN32_IS_NON_UNC_PREFIX(ptr) \ + (0 == memcmp(ptr, WIN32_NON_UNC_PREFIX, WIN32_NON_UNC_PREFIX_LEN)) + +# define WIN32_IS_SPECIAL_NUL_FILE(ptr) \ + (0 == memcmp(ptr, "NUL", 3) || 0 == memcmp(ptr, "nul", 3)) + +/* Get full path name without symlinks resolution. + It also converts all forward slashes to back slashes. +*/ +char* get_full_path_name(const char *filename) { + DWORD len; + char *buf, *ptr, *res; + + /* determining the required buffer size. + from the man: `If the lpBuffer buffer is too small to contain + the path, the return value is the size, in TCHARs, of the buffer + that is required to hold the path _and_the_terminating_null_character_` + */ + len = GetFullPathName(filename, 0, NULL, NULL); + + if ( len == 0 ) + return strdup(filename); + + buf = (char *)malloc(len); + + /* no point to check the result again */ + len = GetFullPathName(filename, len, buf, NULL); + buf[len] = 0; + + /* replace slashes */ + WIN32_REPLACE_SLASHES(buf, len); + + /* calculate offset based on prefix type */ + len = WIN32_IS_UNC_PREFIX(buf) + ? (WIN32_UNC_PREFIX_LEN - 2) + : WIN32_IS_NON_UNC_PREFIX(buf) + ? WIN32_NON_UNC_PREFIX_LEN + : 0 + ; + + ptr = buf + len; + if ( WIN32_IS_UNC_PREFIX(buf) ) { + ptr[0] = '/'; + ptr[1] = '/'; + } + + res = strdup(ptr); + + free(buf); + + return res; +} + +# if _WIN32_WINNT >= 0x0600 + +/* Get full path name WITH symlinks resolution. + It also converts all forward slashes to back slashes. +*/ +char* get_final_path_name(HANDLE fh) { + DWORD len; + char *buf, *ptr, *res; + + /* determining the required buffer size. + from the man: `If the function fails because lpszFilePath is too + small to hold the string plus the terminating null character, + the return value is the required buffer size, in TCHARs. This + value _includes_the_size_of_the_terminating_null_character_`. + but in my testcase I have path with 26 chars, the function + returns 26 also, ie without the trailing zero-char... + */ + len = GetFinalPathNameByHandle( + fh + ,NULL + ,0 + ,FILE_NAME_NORMALIZED | VOLUME_NAME_DOS + ); + + if ( len == 0 ) + return NULL; + + len += 1; /* for zero-char */ + buf = (char *)malloc(len); + + /* no point to check the result again */ + len = GetFinalPathNameByHandle( + fh + ,buf + ,len + ,FILE_NAME_NORMALIZED | VOLUME_NAME_DOS + ); + buf[len] = 0; + + /* replace slashes */ + WIN32_REPLACE_SLASHES(buf, len); + + /* calculate offset based on prefix type */ + len = WIN32_IS_UNC_PREFIX(buf) + ? (WIN32_UNC_PREFIX_LEN - 2) + : WIN32_IS_NON_UNC_PREFIX(buf) + ? WIN32_NON_UNC_PREFIX_LEN + : 0 + ; + + ptr = buf + len; + if ( WIN32_IS_UNC_PREFIX(buf) ) { + ptr[0] = '/'; + ptr[1] = '/'; + } + + res = strdup(ptr); + + free(buf); + + return res; +} + +# endif // _WIN32_WINNT >= 0x0600 + +# endif // _WIN32 #endif char * @@ -128,30 +258,51 @@ lrealpath (const char *filename) } #endif - /* The MS Windows method. If we don't have realpath, we assume we - don't have symlinks and just canonicalize to a Windows absolute - path. GetFullPath converts ../ and ./ in relative paths to - absolute paths, filling in current drive if one is not given - or using the current directory of a specified drive (eg, "E:foo"). - It also converts all forward slashes to back slashes. */ + /* The MS Windows method */ #if defined (_WIN32) { - char buf[MAX_PATH]; - char* basename; - DWORD len = GetFullPathName (filename, MAX_PATH, buf, &basename); - if (len == 0 || len > MAX_PATH - 1) - return strdup (filename); - else - { - /* The file system is case-preserving but case-insensitive, - Canonicalize to lowercase, using the codepage associated - with the process locale. */ - CharLowerBuff (buf, len); - return strdup (buf); + char *res; + /* For Windows Vista and greater */ +#if _WIN32_WINNT >= 0x0600 + + /* For some reason the function receives just empty `filename`, but not NULL. + What should we do in that case? + According to `strdup()` implementation + (https://elixir.bootlin.com/glibc/latest/source/string/strdup.c) + it will alloc 1 byte even for empty but non NULL string. + OK, will use `strdup()` for that case. + */ + if ( 0 == strlen(filename) ) + return strdup(filename); + + if ( WIN32_IS_SPECIAL_NUL_FILE(filename) ) { + res = get_full_path_name(filename); + } else { + HANDLE fh = CreateFile( + filename + ,FILE_READ_ATTRIBUTES + ,FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE + ,NULL + ,OPEN_EXISTING + ,FILE_FLAG_BACKUP_SEMANTICS + ,NULL + ); + + if ( fh == INVALID_HANDLE_VALUE ) { + res = get_full_path_name(filename); + } else { + res = get_final_path_name(fh); + CloseHandle(fh); } - } -#endif + } + +#else + /* For Windows XP */ + res = get_full_path_name(filename); - /* This system is a lost cause, just duplicate the filename. */ - return strdup (filename); +#endif // _WIN32_WINNT >= 0x0600 + + return res; + } +#endif // _WIN32 }