[newlib-cygwin/cygwin-3_4-branch] Cygwin: /proc/cpuinfo: always print trailing empty line, as on Linux

Corinna Vinschen corinna@sourceware.org
Mon Jan 16 20:41:36 GMT 2023


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

commit 39db1a7f423b5ddfdc5a8ce484757448d8e4f9d6
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Mon Jan 16 21:40:59 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Mon Jan 16 21:41:13 2023 +0100

    Cygwin: /proc/cpuinfo: always print trailing empty line, as on Linux
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/fhandler/proc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc
index 66272125cb20..92bcc564dde3 100644
--- a/winsup/cygwin/fhandler/proc.cc
+++ b/winsup/cygwin/fhandler/proc.cc
@@ -660,8 +660,6 @@ format_proc_cpuinfo (void *, char *&destbuf)
       __small_swprintf (cpu_num_p, L"%d", cpu_number);
       if (!NT_SUCCESS (RtlCheckRegistryKey (RTL_REGISTRY_ABSOLUTE, cpu_key)))
 	break;
-      if (cpu_number)
-	print ("\n");
 
       WORD cpu_group = cpu_number / num_cpu_per_group;
       KAFFINITY cpu_mask = 1L << (cpu_number % num_cpu_per_group);
@@ -1701,6 +1699,8 @@ format_proc_cpuinfo (void *, char *&destbuf)
       print ("\n");
     }
 
+  print ("\n");
+
   destbuf = (char *) crealloc_abort (destbuf, bufptr - buf);
   memcpy (destbuf, buf, bufptr - buf);
   return bufptr - buf;


More information about the Cygwin-cvs mailing list