From 5e051b1bf7e468251890457a62093c509168f304 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 12 Nov 2001 20:21:43 +0000 Subject: [PATCH] * cygcheck.cc (dump_sysinfo): Add some more details. --- winsup/utils/ChangeLog | 4 ++++ winsup/utils/cygcheck.cc | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index b0afbf07d..55b071f81 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2001-11-12 Corinna Vinschen + + * cygcheck.cc (dump_sysinfo): Add some more details. + 2001-11-12 Corinna Vinschen * cygcheck.cc (dump_sysinfo): Print more detailed OS information string diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 42fa22520..dba77f5bc 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