diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-11-12 20:21:43 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-11-12 20:21:43 +0000 |
| commit | 5e051b1bf7e468251890457a62093c509168f304 (patch) | |
| tree | 917b00d4164247744918ac2d43e4d845494ebdba | |
| parent | daccfdf9efff7075770004350588251850aa67d2 (diff) | |
| download | newlib-5e051b1bf7e468251890457a62093c509168f304.zip newlib-5e051b1bf7e468251890457a62093c509168f304.tar.gz newlib-5e051b1bf7e468251890457a62093c509168f304.tar.bz2 | |
* cygcheck.cc (dump_sysinfo): Add some more details.
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 22 |
2 files changed, 22 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index b0afbf0..55b071f 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,9 @@ 2001-11-12 Corinna Vinschen <corinna@vinschen.de> + * cygcheck.cc (dump_sysinfo): Add some more details. + +2001-11-12 Corinna Vinschen <corinna@vinschen.de> + * cygcheck.cc (dump_sysinfo): Print more detailed OS information string using OSVERSIONINFOEX information. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 42fa225..dba77f5 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -808,8 +808,16 @@ dump_sysinfo () { if (!more_info) osname = (char *) "2000"; - else if (osversionex.wProductType == VER_NT_SERVER) - osname = (char *) "2000 Server"; + else if (osversionex.wProductType == VER_NT_SERVER + || osversionex.wProductType == VER_NT_DOMAIN_CONTROLLER) + { + if (osversionex.wSuiteMask & VER_SUITE_DATACENTER) + osname = (char *) "2000 Datacenter Server"; + else if (osversionex.wSuiteMask & VER_SUITE_ENTERPRISE) + osname = (char *) "2000 Advanced Server"; + else + osname = (char *) "2000 Server"; + } else osname = (char *) "2000 Professional"; } @@ -817,8 +825,14 @@ dump_sysinfo () { if (!more_info) osname = (char *) "XP"; - else if (osversionex.wProductType == VER_NT_SERVER) - osname = (char *) ".NET Server"; + else if (osversionex.wProductType == VER_NT_SERVER + || osversionex.wProductType == VER_NT_DOMAIN_CONTROLLER) + { + if (osversionex.wSuiteMask & VER_SUITE_ENTERPRISE) + osname = (char *) ".NET Enterprise Server"; + else + osname = (char *) ".NET Server"; + } else if (osversionex.wSuiteMask & VER_SUITE_PERSONAL) osname = (char *) "XP Home Edition"; else |