diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-11-09 20:18:36 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-11-09 20:18:36 +0300 |
| commit | 9a6c0a241bd45c680199e67ebb2a3371c6c2129a (patch) | |
| tree | e253f58afe47371787db2224332a80cc365d5687 | |
| parent | 4d1fdcb6f84d37738f119273045278ca4fae4a91 (diff) | |
* cygcheck.cc (dump_sysinfo): Print more detailed OS information string.
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 25 |
2 files changed, 25 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 162292172..56db805b8 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2001-11-09 Corinna Vinschen <corinna@vinschen.de> + + * cygcheck.cc (dump_sysinfo): Print more detailed OS information string. + 2001-11-04 Corinna Vinschen <corinna@vinschen.de> * getfacl.c (username): New function. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 19055814a..11a04d467 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -750,10 +750,19 @@ dump_sysinfo () switch (osversion.dwMinorVersion) { case 0: - osname = (char *) "Win95"; + if (strchr(osversion.szCSDVersion, 'C')) + osname = (char *) "Win95OSR2"; + else + osname = (char *) "Win95"; break; - case 1: - osname = (char *) "Win98"; + case 10: + if (strchr(osversion.szCSDVersion, 'A')) + osname = (char *) "Win98SE"; + else + osname = (char *) "Win98"; + break; + case 90: + osname = (char *) "WinME"; break; default: osname = (char *) "Win9X"; @@ -761,7 +770,15 @@ dump_sysinfo () } break; case VER_PLATFORM_WIN32_NT: - osname = (char *) "WinNT"; + if (osversion.dwMajorVersion == 5) + { + if (osversion.dwMinorVersion == 0) + osname = (char *) "Win2000"; + else + osname = (char *) "WinXP"; + } + else + osname = (char *) "WinNT"; break; default: osname = (char *) "uknown-os"; |