* external.cc (fillout_pinfo): Use correct pids.
* path.cc (mount_info::conv_to_win32_path): Correct test for whether to include a slash.
This commit is contained in:
parent
37922e1277
commit
c3a245f5bf
@ -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>
|
Fri May 11 01:04:17 2001 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* exceptions.cc (handle_exceptions): Don't print message when executing
|
* exceptions.cc (handle_exceptions): Don't print message when executing
|
||||||
|
@ -49,8 +49,8 @@ fillout_pinfo (pid_t pid, int winpid)
|
|||||||
{
|
{
|
||||||
if (!nextpid && thispid != (DWORD) pid)
|
if (!nextpid && thispid != (DWORD) pid)
|
||||||
continue;
|
continue;
|
||||||
ep.pid = thispid;
|
ep.pid = cygwin_pid (thispid);
|
||||||
ep.dwProcessId = cygwin_pid (thispid);
|
ep.dwProcessId = thispid;
|
||||||
ep.process_state = PID_IN_USE;
|
ep.process_state = PID_IN_USE;
|
||||||
ep.ctty = -1;
|
ep.ctty = -1;
|
||||||
break;
|
break;
|
||||||
|
@ -1265,7 +1265,9 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst,
|
|||||||
int n = mi->native_pathlen;
|
int n = mi->native_pathlen;
|
||||||
memcpy (dst, mi->native_path, n + 1);
|
memcpy (dst, mi->native_path, n + 1);
|
||||||
char *p = pathbuf + mi->posix_pathlen;
|
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++] = '\\';
|
dst[n++] = '\\';
|
||||||
strcpy (dst + n, p);
|
strcpy (dst + n, p);
|
||||||
backslashify (dst, dst, 0);
|
backslashify (dst, dst, 0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user