public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_4-branch] Cygwin: 3.4-only: uname: drop dot from external release info
@ 2022-12-08 18:02 Corinna Vinschen
  0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2022-12-08 18:02 UTC (permalink / raw)
  To: cygwin-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b5eba8e972786275c76ea69a7ce6ef8d7c8279c3

commit b5eba8e972786275c76ea69a7ce6ef8d7c8279c3
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Thu Dec 8 18:48:45 2022 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Dec 8 18:53:24 2022 +0100

    Cygwin: 3.4-only: uname: drop dot from external release info
    
    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")
    
    Add the dot when attaching the machine info.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

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 */

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-12-08 18:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-08 18:02 [newlib-cygwin/cygwin-3_4-branch] Cygwin: 3.4-only: uname: drop dot from external release info Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).