From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.lisp.guile.devel Subject: Update 'uname' emulation on MS-Windows Date: Sat, 16 Jul 2016 10:27:16 +0300 Message-ID: <83poqe59gr.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1468654077 2125 80.91.229.3 (16 Jul 2016 07:27:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jul 2016 07:27:57 +0000 (UTC) Cc: guile-devel@gnu.org To: Andy Wingo Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Jul 16 09:27:53 2016 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bOK0s-00006F-TB for guile-devel@m.gmane.org; Sat, 16 Jul 2016 09:27:51 +0200 Original-Received: from localhost ([::1]:36284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOK0r-0000bO-Qz for guile-devel@m.gmane.org; Sat, 16 Jul 2016 03:27:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOK0Y-0000bJ-Cg for guile-devel@gnu.org; Sat, 16 Jul 2016 03:27:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bOK0T-00087g-BP for guile-devel@gnu.org; Sat, 16 Jul 2016 03:27:29 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOK0T-00087V-7o; Sat, 16 Jul 2016 03:27:25 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4286 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bOK0S-0004Zt-GX; Sat, 16 Jul 2016 03:27:24 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:18523 Archived-At: The processors and OS versions of the emulated 'uname' need an update; the patch below does that: 2016-07-16 Eli Zaretskii * libguile/posix-w32.c (uname): Update to modern processors (ia64 and x86_64) and OS versions (Vista to Windows 10). Delete trailing whitespace. --- libguile/posix-w32.c~1 2016-07-15 19:18:26.835750000 +0300 +++ libguile/posix-w32.c 2016-07-16 10:22:08.273250000 +0300 @@ -64,13 +64,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) @@ -91,11 +104,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, " "); @@ -115,10 +128,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) { @@ -142,13 +158,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;