From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id F296A392B14B; Thu, 8 Dec 2022 18:02:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F296A392B14B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670522576; bh=pHkXylk14ZZk5UaFwxYSTpaRJJq0b4H9H2VfMwFT9Pc=; h=From:To:Subject:Date:From; b=ksR4ANOosDLsJMuiNFx7EWP65/DVnDow74n15Q6IH8130O20aiwZZd0KpgdCgBXjC nfhRuWO3jqI1ZsOjcO4f59YkBwLLcHxhGAQxWJaFcVlhCqKyn/RybE/tA51acRDBn9 WFljO6YgA1pwb0OabM74Y3hIALdhCd7MQopm3sIM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: 3.4-only: uname: drop dot from external release info X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 3baeb898ee276bb5563b41dd378d2a1f77fb90b7 X-Git-Newrev: b5eba8e972786275c76ea69a7ce6ef8d7c8279c3 Message-Id: <20221208180256.F296A392B14B@sourceware.org> Date: Thu, 8 Dec 2022 18:02:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db5eba8e9727= 86275c76ea69a7ce6ef8d7c8279c3 commit b5eba8e972786275c76ea69a7ce6ef8d7c8279c3 Author: Corinna Vinschen AuthorDate: Thu Dec 8 18:48:45 2022 +0100 Commit: Corinna Vinschen CommitDate: Thu Dec 8 18:53:24 2022 +0100 Cygwin: 3.4-only: uname: drop dot from external release info =20 Right now, the dot between the version and the machine info in the release field is expected to come in from CYGPORT_RELEASE_INFO. But that's just confusing and doesn't match what we now do in 3.5 since commit 97eb64b909bc ("Cygwin: uname: generate default release string from git as well") =20 Add the dot when attaching the machine info. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/uname.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc index e893660c6a1d..be7d7c03154b 100644 --- a/winsup/cygwin/uname.cc +++ b/winsup/cygwin/uname.cc @@ -45,7 +45,7 @@ uname_x (struct utsname *name) #ifdef CYGPORT_RELEASE_INFO stpcpy (name->release, __XSTRING (CYGPORT_RELEASE_INFO)); #else - __small_sprintf (name->release, "%d.%d.%d-0.%d.local.", + __small_sprintf (name->release, "%d.%d.%d-0.%d.local", cygwin_version.dll_major / 1000, cygwin_version.dll_major % 1000, cygwin_version.dll_minor, @@ -58,10 +58,10 @@ uname_x (struct utsname *name) switch (wincap.cpu_arch ()) { case PROCESSOR_ARCHITECTURE_AMD64: - strcat (name->release, strcpy (name->machine, "x86_64")); + strcat (name->release, strcpy (name->machine, ".x86_64")); break; default: - strcpy (name->machine, "unknown"); + strcpy (name->machine, ".unknown"); break; } /* domainame */