libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: cygcheck: improve OS output 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-02-09 14:41:12 +01:00
parent 2a683f84a1
commit dc70c8dec1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
winsup/utils/mingw/cygcheck.cc
View File

@ -31,6 +31,10 @@
#include <mntent.h> #include <mntent.h>
#include "loadlib.h" #include "loadlib.h"
#ifndef PRODUCT_IOTENTERPRISES
#define PRODUCT_IOTENTERPRISES 0x000000bf
#endif
#ifndef max #ifndef max
#define max __max #define max __max
#endif #endif
@ -1423,24 +1427,24 @@ dump_sysinfo ()
{ {
case 0: case 0:
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "Vista" : "2008"); ? "Vista" : "Server 2008");
break; break;
case 1: case 1:
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "7" : "2008 R2"); ? "7" : "Server 2008 R2");
break; break;
case 2: case 2:
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "8" : "2012"); ? "8" : "Server 2012");
break; break;
case 3: case 3:
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "8.1" : "2012 R2"); ? "8.1" : "Server 2012 R2");
break; break;
case 4: case 4:
default: default:
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "10 Preview" : "2016 Preview"); ? "10 Preview" : "Server 2016 Preview");
break; break;
} }
else if (osversion.dwMajorVersion == 10) else if (osversion.dwMajorVersion == 10)
@ -1450,13 +1454,13 @@ dump_sysinfo ()
else else
{ {
if (osversion.dwBuildNumber <= 14393) if (osversion.dwBuildNumber <= 14393)
strcpy (osname, "2016"); strcpy (osname, "Server 2016");
else if (osversion.dwBuildNumber <= 17763) else if (osversion.dwBuildNumber <= 17763)
strcpy (osname, "2019"); strcpy (osname, "Server 2019");
else if (osversion.dwBuildNumber <= 20348) else if (osversion.dwBuildNumber <= 20348)
strcpy (osname, "2022"); strcpy (osname, "Server 2022");
else else
strcpy (osname, "20??"); strcpy (osname, "Server 20??");
} }
} }
DWORD prod; DWORD prod;
@ -1663,7 +1667,7 @@ dump_sysinfo ()
}; };
if (prod == PRODUCT_UNLICENSED) if (prod == PRODUCT_UNLICENSED)
strcat (osname, "Unlicensed"); strcat (osname, "Unlicensed");
else if (prod > 0x000000bf) else if (prod > PRODUCT_IOTENTERPRISES)
strcat (osname, ""); strcat (osname, "");
else else
strcat (osname, products[prod]); strcat (osname, products[prod]);