From: Nick Clifton <nickc@sourceware.org>
To: binutils-cvs@sourceware.org
Subject: [binutils-gdb] Remove dependency upon shlwapi library when building BFD for Windows/MinGW environments.
Date: Mon, 15 Apr 2024 15:43:36 +0000 (GMT) [thread overview]
Message-ID: <20240415154336.18C3F3858D32@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9dd918142787246ea7ed53494d9cbc6b51486133
commit 9dd918142787246ea7ed53494d9cbc6b51486133
Author: Nick Clifton <nickc@redhat.com>
Date: Mon Apr 15 16:42:15 2024 +0100
Remove dependency upon shlwapi library when building BFD for Windows/MinGW environments.
PR 31527
Diff:
---
bfd/bfdio.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 56 insertions(+), 12 deletions(-)
diff --git a/bfd/bfdio.c b/bfd/bfdio.c
index 718cbe89023..a69c1c31cfa 100644
--- a/bfd/bfdio.c
+++ b/bfd/bfdio.c
@@ -29,8 +29,6 @@
#if defined (_WIN32)
#include <windows.h>
#include <locale.h>
-/* FIXME: Do we need a configure time test for the presence of this headers ? */
-#include <shlwapi.h> /* Needed for PathIsNetworkPathA(). */
#endif
#ifndef S_IXUSR
@@ -123,28 +121,72 @@ _bfd_real_fopen (const char *filename, const char *modes)
wchar_t ** lpFilePart = {NULL};
const wchar_t prefixDOS[] = L"\\\\?\\";
const wchar_t prefixUNC[] = L"\\\\?\\UNC\\";
+ const wchar_t prefixNone[] = L"";
const size_t partPathLen = strlen (filename) + 1;
const wchar_t * prefix;
size_t sizeof_prefix;
-
- /* PR 31527: Paths that begin with two backslash characters
- (\\) are interpreted as Universal Naming Convention (UNC)
- paths. They use the "\\?\UNC\" prefix for network UNC paths
- and the "\\?\" prefix for dos UNC paths. For more information
- see: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
+ bool strip_network_prefix = false;
+
+ /* PR 31527: In order to not hit limits in the maximum file path, all paths
+ need converting to Universal Naming Convention (UNC) syntax. The following
+ forms may be provided to this function and are converted accordingly.
+
+ 1. UNC paths (start with \\?\), these are unconverted;
+ 2. Network paths (start with \\ or // but not \\?\), these are given the
+ \\?UNC\ prefix, and have the incoming \\ or // removed;
+ 3. DOS drive paths (a letter followed by a colon), these are given the
+ \\?\ prefix;
+ 4. Paths relative to CWD, the current working directory is tested for the
+ above conditions, and otherwise are assumed to be DOS paths.
+
+ For more information see:
+ https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
*/
- bool is_network_path = PathIsNetworkPathA (filename);
- if (is_network_path)
+ if (startswith (filename, "\\\\?\\"))
+ {
+ prefix = prefixNone;
+ sizeof_prefix = sizeof (prefixNone);
+ }
+ else if (startswith (filename, "\\\\") || startswith (filename, "//"))
{
prefix = prefixUNC;
sizeof_prefix = sizeof (prefixUNC);
+ strip_network_prefix = true;
}
- else
+ else if (strlen (filename) > 2 && filename[1] == ':')
{
prefix = prefixDOS;
sizeof_prefix = sizeof (prefixDOS);
}
+ else
+ {
+ /* The partial path is relative to the current working directory, use this
+ to determine the prefix.
+ 1) Get the length: Calling with lpBuffer set to null returns the length.
+ 2) Resolve the path. */
+ size_t pwdWSize = GetCurrentDirectoryW (0, NULL);
+ wchar_t * pwdPath = calloc (pwdWSize, sizeof(wchar_t));
+ GetCurrentDirectoryW (pwdWSize, pwdPath);
+ if (wcsncmp (pwdPath, L"\\\\?\\", 6) == 0)
+ {
+ prefix = prefixNone;
+ sizeof_prefix = sizeof (prefixNone);
+ }
+ else if (wcsncmp (pwdPath, L"\\\\", 2) == 0
+ || wcsncmp (pwdPath, L"//", 2) == 0)
+ {
+ prefix = prefixUNC;
+ sizeof_prefix = sizeof (prefixUNC);
+ strip_network_prefix = true;
+ }
+ else
+ {
+ prefix = prefixDOS;
+ sizeof_prefix = sizeof (prefixDOS);
+ }
+ free (pwdPath);
+ }
#ifdef __MINGW32__
#if !HAVE_DECL____LC_CODEPAGE_FUNC
@@ -188,7 +230,7 @@ _bfd_real_fopen (const char *filename, const char *modes)
GetFullPathNameW (partPath, fullPathWSize, fullPathOffset, lpFilePart);
- if (is_network_path)
+ if (strip_network_prefix)
{
/* Remove begining of the beginning two backslash characters (\\). */
wchar_t *_fullPath = calloc (fullPathWSize + sizeof_prefix + 1, sizeof(wchar_t));
@@ -206,6 +248,8 @@ _bfd_real_fopen (const char *filename, const char *modes)
MultiByteToWideChar (cp, 0, modes, -1, modesW, sizeof(modesW));
FILE * file = _wfopen (fullPath, modesW);
+ if (!file)
+ perror("Error opening file");
free (fullPath);
return close_on_exec (file);
reply other threads:[~2024-04-15 15:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240415154336.18C3F3858D32@sourceware.org \
--to=nickc@sourceware.org \
--cc=binutils-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).