From c3a245f5bf92f48a2f9e3b2b59fcff400cb91b7e Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Fri, 11 May 2001 21:01:44 +0000
Subject: * external.cc (fillout_pinfo): Use correct pids. * path.cc
(mount_info::conv_to_win32_path): Correct test for whether to include a
slash.
---
winsup/cygwin/ChangeLog | 6 ++++++
winsup/cygwin/external.cc | 4 ++--
winsup/cygwin/path.cc | 4 +++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c4a29fc..e105d47 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 9f46835..cd624d1 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 048063d..3fb4f56 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);
--
cgit v1.1