diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-03-18 02:49:29 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-03-18 02:49:29 +0000 |
| commit | 00a7496150b8ab848730cc7e09536babd6b0dc72 (patch) | |
| tree | 2d5ec07a799d35a981e321b74f9df5c91000f6d1 | |
| parent | ee57685985fb60d9d22f5f38f7cfaa14b24df54c (diff) | |
| download | cygnal-00a7496150b8ab848730cc7e09536babd6b0dc72.tar.gz cygnal-00a7496150b8ab848730cc7e09536babd6b0dc72.tar.bz2 cygnal-00a7496150b8ab848730cc7e09536babd6b0dc72.zip | |
* external.cc (fillout_pinfo): Match windows pid, as well as cygwin pid when
passed in pid. Don't prematurely break when searching for a pid.
* thread.h (_winsup_t): Eliminate unneeded field.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/external.cc | 5 | ||||
| -rw-r--r-- | winsup/cygwin/thread.h | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 127070c4c..9d9016046 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 17 21:48:03 2001 Christopher Faylor <cgf@cygnus.com> + + * external.cc (fillout_pinfo): Match windows pid, as well as cygwin pid + when passed in pid. Don't prematurely break when searching for a pid. + + * thread.h (_winsup_t): Eliminate unneeded field. + Sat Mar 17 20:46:00 2001 Corinna Vinschen <corinna@vinschen.de> * net.cc (get_95_ifconf): Use strcasematch instead of strcasecmp. diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc index c78b64722..cd1b92ec4 100644 --- a/winsup/cygwin/external.cc +++ b/winsup/cygwin/external.cc @@ -53,8 +53,9 @@ fillout_pinfo (pid_t pid, int winpid) ep.dwProcessId = cygwin_pid (thispid); ep.process_state = PID_IN_USE; ep.ctty = -1; + break; } - else if (nextpid || p->pid == pid) + else if (nextpid || p->pid == pid || (winpid && thispid == (DWORD) pid)) { ep.ctty = tty_attached (p) ? p->ctty : -1; ep.pid = p->pid; @@ -74,8 +75,8 @@ fillout_pinfo (pid_t pid, int winpid) ep.strace_file = 0; ep.process_state = p->process_state; + break; } - break; } if (!ep.pid) diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h index c2758c6e5..d7a298514 100644 --- a/winsup/cygwin/thread.h +++ b/winsup/cygwin/thread.h @@ -61,7 +61,6 @@ struct _winsup_t /* console.cc */ unsigned _rarg; - char _my_title_buf[TITLESIZE + 1]; /* dlfcn.cc */ int _dl_error; |