diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-10-16 19:14:22 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-10-16 19:14:22 +0400 |
| commit | 340854dda878cb615c5c6c512a59a871d757cec1 (patch) | |
| tree | c637eea00e05f1488cf51727c4379a8d25f03e7f | |
| parent | 1c1fa247a6cedc1fb620aa394111abc810c82967 (diff) | |
* fhandler_process.cc (format_process_ctty): Fix random content of
/proc/$PID/ctty if the process has no controlling tty. Set to just
"\n" instead.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 7 | ||||
| -rw-r--r-- | winsup/cygwin/release/1.7.26 | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6b20881be..3e46685bb 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2013-10-16 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_process.cc (format_process_ctty): Fix random content of + /proc/$PID/ctty if the process has no controlling tty. Set to just + "\n" instead. + 2013-10-15 Corinna Vinschen <corinna@vinschen.de> * autoload.cc (CryptAcquireContextW): Remove. diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 044757d74..8776702a6 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -433,8 +433,13 @@ format_process_gid (void *data, char *&destbuf) static off_t format_process_ctty (void *data, char *&destbuf) { - device d; _pinfo *p = (_pinfo *) data; + if (p->ctty < 0) + { + destbuf = (char *) crealloc_abort (destbuf, 2); + return __small_sprintf (destbuf, "\n"); + } + device d; d.parse (p->ctty); destbuf = (char *) crealloc_abort (destbuf, strlen (d.name) + 2); return __small_sprintf (destbuf, "%s\n", d.name); diff --git a/winsup/cygwin/release/1.7.26 b/winsup/cygwin/release/1.7.26 index ef21b6901..8f15405bd 100644 --- a/winsup/cygwin/release/1.7.26 +++ b/winsup/cygwin/release/1.7.26 @@ -15,3 +15,6 @@ Bug fixes: - 64 bit only: Correctly mmap'ing regions > 4 Gigs. Fixes: http://cygwin.com/ml/cygwin/2013-09/msg00155.html + +- Fix random content of /proc/$PID/ctty if the process has no controlling + tty. Set to just "\n" instead. |