public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: 3.4-only: uname: drop dot from external release info
Date: Thu,  8 Dec 2022 18:02:56 +0000 (GMT)	[thread overview]
Message-ID: <20221208180256.F296A392B14B@sourceware.org> (raw)

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

                 reply	other threads:[~2022-12-08 18:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221208180256.F296A392B14B@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).