aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-08-16 09:27:59 +0100
committerRon Yorston <rmy@pobox.com>2021-08-16 09:27:59 +0100
commit4c08d5f6b53b0ea2fd8d422c02d428ad183d5a9b (patch)
treea5c6b796d53c4d8597664cfabed58a69053cf3a0
parent39affac891d2683cf6c09901d2c3cf69bf2c95fa (diff)
downloadbusybox-w32-4c08d5f6b53b0ea2fd8d422c02d428ad183d5a9b.tar.gz
busybox-w32-4c08d5f6b53b0ea2fd8d422c02d428ad183d5a9b.tar.bz2
busybox-w32-4c08d5f6b53b0ea2fd8d422c02d428ad183d5a9b.zip
win32: code shrink uname(2)
If GetVersionEx() fails just assume the OS version numbers remain set to zero and print them as-is. Saves 48 bytes.
-rw-r--r--win32/uname.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/win32/uname.c b/win32/uname.c
index 008d67a8b..357a6fc64 100644
--- a/win32/uname.c
+++ b/win32/uname.c
@@ -17,14 +17,10 @@ int uname(struct utsname *name)
17 memset(&os_info, 0, sizeof(OSVERSIONINFO)); 17 memset(&os_info, 0, sizeof(OSVERSIONINFO));
18 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); 18 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
19 19
20 if (GetVersionEx(&os_info)) { 20 GetVersionEx(&os_info);
21 sprintf(name->release, "%u.%u", (unsigned int)os_info.dwMajorVersion, 21 sprintf(name->release, "%u.%u", (unsigned int)os_info.dwMajorVersion,
22 (unsigned int)os_info.dwMinorVersion); 22 (unsigned int)os_info.dwMinorVersion);
23 sprintf(name->version, "%u", (unsigned int)os_info.dwBuildNumber); 23 sprintf(name->version, "%u", (unsigned int)os_info.dwBuildNumber);
24 } else {
25 strcpy(name->release, unk);
26 strcpy(name->version, unk);
27 }
28 24
29 GetSystemInfo(&sys_info); 25 GetSystemInfo(&sys_info);
30 switch (sys_info.wProcessorArchitecture) { 26 switch (sys_info.wProcessorArchitecture) {