]> sourceware.org Git - newlib-cygwin.git/commitdiff
Cygwin: 3.4-only: uname: drop dot from external release info
authorCorinna Vinschen <corinna@vinschen.de>
Thu, 8 Dec 2022 17:48:45 +0000 (18:48 +0100)
committerCorinna Vinschen <corinna@vinschen.de>
Thu, 8 Dec 2022 17:53:24 +0000 (18:53 +0100)
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>
winsup/cygwin/uname.cc

index e893660c6a1dfb81a38b597a5b1899a226ab6220..be7d7c03154b28d8fe7f6d2ee49bbf9ed2046357 100644 (file)
@@ -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 */
This page took 0.034299 seconds and 5 git commands to generate.