[newlib-cygwin] Cygwin: Correct /proc/*/stat for processes without ctty

Corinna Vinschen corinna@sourceware.org
Thu Nov 10 09:09:14 GMT 2022


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

commit 59b8ee7d7066b9a3f39e1c765d0cecb5d9bc07fd
Author: Andy Koppe <andy.koppe@gmail.com>
Date:   Wed Nov 9 20:34:30 2022 +0000

    Cygwin: Correct /proc/*/stat for processes without ctty
    
    Report 0 instead of 268435455 (i.e. 0xFFFFFFF) in the tty field of
    /proc/*/stat for processes without a controlling terminal. This is what
    the procps utility expects when selecting or excluding such processes.

Diff:
---
 winsup/cygwin/fhandler/process.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/fhandler/process.cc b/winsup/cygwin/fhandler/process.cc
index a8c17f1b0..b0aef2ebe 100644
--- a/winsup/cygwin/fhandler/process.cc
+++ b/winsup/cygwin/fhandler/process.cc
@@ -1092,9 +1092,11 @@ format_process_stat (void *data, char *&destbuf)
   int nice = 0;
 /* ctty maj is 31:16, min is 15:0; tty_nr s/b maj 15:8, min 31:20, 7:0;
    maj is 31:16 >> 16 & fff << 8; min is 15:0 >> 8 & ff << 20 | & ff */
-  int tty_nr =    (((p->ctty >>  8) & 0xff)  << 20)
-		| (((p->ctty >> 16) & 0xfff) <<  8)
-		|   (p->ctty        & 0xff);
+  int tty_nr = 0;
+  if (p->ctty > 0)
+    tty_nr =   (((p->ctty >>  8) & 0xff)  << 20)
+	     | (((p->ctty >> 16) & 0xfff) <<  8)
+	     |   (p->ctty        & 0xff);
 
   if (p->process_state & PID_EXITED)
     strcpy (cmd, "<defunct>");


More information about the Cygwin-cvs mailing list