diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-07-16 10:54:45 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-07-25 11:44:45 +0200 |
| commit | d87915f25d47711f0061e7ff92485859bb5747e6 (patch) | |
| tree | fa55b36d0ab59b7ada2fcc1fd1751992e3d8f96d /libguile/posix-w32.c | |
| parent | da0ee4dc80a6c0283292ab25648afaa3a55d55e9 (diff) | |
| download | guile-d87915f25d47711f0061e7ff92485859bb5747e6.tar.gz | |
Update uname implementation in posix-w32
* libguile/posix-w32.c (uname): Update to modern processors (ia64 and
x86_64) and OS versions (Vista to Windows 10). Delete trailing
whitespace.
Diffstat (limited to 'libguile/posix-w32.c')
| -rw-r--r-- | libguile/posix-w32.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/libguile/posix-w32.c b/libguile/posix-w32.c index f7df180f5..21b779e4e 100644 --- a/libguile/posix-w32.c +++ b/libguile/posix-w32.c @@ -59,13 +59,26 @@ uname (struct utsname *uts) strcpy (uts->sysname, "Windows NT3x"); /* NT3x */ else if (osver.dwMajorVersion == 5 && osver.dwMinorVersion < 1) strcpy (uts->sysname, "Windows 2000"); /* 2k */ - else if (osver.dwMajorVersion >= 5) + else if (osver.dwMajorVersion < 6) strcpy (uts->sysname, "Windows XP"); /* XP */ + else if (osver.dwMajorVersion == 6) + { + if (osver.dwMinorVersion < 1) + strcpy (uts->sysname, "Windows Vista"); /* Vista */ + else if (osver.dwMinorVersion < 2) + strcpy (uts->sysname, "Windows 7"); /* Windows 7 */ + else if (osver.dwMinorVersion < 3) + strcpy (uts->sysname, "Windows 8"); /* Windows 8 */ + else if (osver.dwMinorVersion < 4) + strcpy (uts->sysname, "Windows 8.1"); /* Windows 8.1 */ + } + else if (osver.dwMajorVersion >= 10) + strcpy (uts->sysname, "Windows 10 or later"); /* Windows 10 and later */ os = WinNT; break; case VER_PLATFORM_WIN32_WINDOWS: /* Win95, Win98 or WinME */ - if ((osver.dwMajorVersion > 4) || + if ((osver.dwMajorVersion > 4) || ((osver.dwMajorVersion == 4) && (osver.dwMinorVersion > 0))) { if (osver.dwMinorVersion >= 90) @@ -86,11 +99,11 @@ uname (struct utsname *uts) break; } - sprintf (uts->version, "%ld.%02ld", + sprintf (uts->version, "%ld.%02ld", osver.dwMajorVersion, osver.dwMinorVersion); if (osver.szCSDVersion[0] != '\0' && - (strlen (osver.szCSDVersion) + strlen (uts->version) + 1) < + (strlen (osver.szCSDVersion) + strlen (uts->version) + 1) < sizeof (uts->version)) { strcat (uts->version, " "); @@ -110,10 +123,13 @@ uname (struct utsname *uts) case PROCESSOR_ARCHITECTURE_MIPS: strcpy (uts->machine, "mips"); break; + case PROCESSOR_ARCHITECTURE_IA64: + strcpy (uts->machine, "ia64"); + break; case PROCESSOR_ARCHITECTURE_INTEL: - /* + /* * dwProcessorType is only valid in Win95 and Win98 and WinME - * wProcessorLevel is only valid in WinNT + * wProcessorLevel is only valid in WinNT */ switch (os) { @@ -137,13 +153,16 @@ uname (struct utsname *uts) default: strcpy (uts->machine, "unknown"); break; - } + } + break; + case PROCESSOR_ARCHITECTURE_AMD64: + strcpy (uts->machine, "x86_64"); break; default: strcpy (uts->machine, "unknown"); break; } - + sLength = sizeof (uts->nodename) - 1; GetComputerName (uts->nodename, &sLength); return 0; |