This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup] Add bitness to user-agent string
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Thu, 19 Oct 2017 13:35:20 +0100
- Subject: [PATCH setup] Add bitness to user-agent string
- Authentication-results: sourceware.org; auth=none
We have no idea about the proportion of 32-bit and 64-bit Cygwin installs.
Add a 'Win32', 'WoW64' or 'Win64' token to the user-agent string to report
bitness.
Future work: it might be useful to report the OS version as well
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
nio-ie5.cc | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/nio-ie5.cc b/nio-ie5.cc
index 24d2c13..c8f65a9 100644
--- a/nio-ie5.cc
+++ b/nio-ie5.cc
@@ -31,11 +31,34 @@
#include "getopt++/StringOption.h"
static StringOption UserAgent ("", '\0', "user-agent", "User agent string for HTTP requests");
-static std::string default_useragent = std::string("Cygwin-Setup/") + setup_version;
static HINTERNET internet_direct = 0;
static HINTERNET internet_preconfig = 0;
+const std::string &
+determine_default_useragent(void)
+{
+ static std::string default_useragent;
+
+ if (!default_useragent.empty())
+ return default_useragent;
+
+ std::string token = "Unknown";
+#ifdef __x86_64__
+ token = "Win64";
+#else
+ typedef BOOL (WINAPI *PFNISWOW64PROCESS)(HANDLE, PBOOL);
+ PFNISWOW64PROCESS pfnIsWow64Process = (PFNISWOW64PROCESS)GetProcAddress(GetModuleHandle("kernel32"), "IsWow64Process");
+ if (pfnIsWow64Process) {
+ BOOL bIsWow64 = FALSE;
+ if (pfnIsWow64Process(GetCurrentProcess(), &bIsWow64))
+ token = bIsWow64 ? "WoW64" : "Win32";
+ }
+#endif
+ default_useragent = std::string("Cygwin-Setup/") + setup_version + " (" + token + ")";
+ return default_useragent;
+}
+
NetIO_IE5::NetIO_IE5 (char const *_url, bool direct, bool cachable):
NetIO (_url)
{
@@ -51,7 +74,7 @@ NetIO (_url)
{
InternetAttemptConnect (0);
- const char *lpszAgent = default_useragent.c_str();
+ const char *lpszAgent = determine_default_useragent().c_str();
if (UserAgent.isPresent())
{
const std::string &user_agent = UserAgent;
--
2.14.2