diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-05-12 01:01:44 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-05-12 01:01:44 +0400 |
| commit | c3a245f5bf92f48a2f9e3b2b59fcff400cb91b7e (patch) | |
| tree | 185d509a235dbf594842633335d8a9722693bf8e | |
| parent | 37922e12777bb7169e3bd6064c6e6e5be4bc01bc (diff) | |
* external.cc (fillout_pinfo): Use correct pids.
* path.cc (mount_info::conv_to_win32_path): Correct test for whether to include
a slash.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/external.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index c4a29fc6a..e105d4741 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +Fri May 11 16:53:38 2001 Christopher Faylor <cgf@cygnus.com> + + * external.cc (fillout_pinfo): Use correct pids. + * path.cc (mount_info::conv_to_win32_path): Correct test for whether to + include a slash. + Fri May 11 01:04:17 2001 Christopher Faylor <cgf@cygnus.com> * exceptions.cc (handle_exceptions): Don't print message when executing diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc index 9f4683583..cd624d179 100644 --- a/winsup/cygwin/external.cc +++ b/winsup/cygwin/external.cc @@ -49,8 +49,8 @@ fillout_pinfo (pid_t pid, int winpid) { if (!nextpid && thispid != (DWORD) pid) continue; - ep.pid = thispid; - ep.dwProcessId = cygwin_pid (thispid); + ep.pid = cygwin_pid (thispid); + ep.dwProcessId = thispid; ep.process_state = PID_IN_USE; ep.ctty = -1; break; diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 048063dde..3fb4f56c3 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1265,7 +1265,9 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, int n = mi->native_pathlen; memcpy (dst, mi->native_path, n + 1); char *p = pathbuf + mi->posix_pathlen; - if ((isdrive (dst) && !dst[2]) || (*p && *p != '/')) + if (*p == '/') + /* nothing */; + else if ((isdrive (dst) && !dst[2]) || *p) dst[n++] = '\\'; strcpy (dst + n, p); backslashify (dst, dst, 0); |