* ps.cc (main): Always print a cygwin process using cygwin paths.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 76692d3..7d632ae 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 24 18:02:35 2000  Christopher Faylor <cgf@cygnus.com>
+
+        * ps.cc (main): Always print a cygwin process using cygwin paths.
+
 2000-08-24  Egor Duda  <deo@logos-m.ru>
 
        * Makefile.in: Add dumper.exe target and associated mechanisms for building it.

diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index 3627612..413defe 100644 (file)
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -261,7 +261,7 @@ main (int argc, char *argv[])
       char pname[MAX_PATH];
       if (p->process_state & PID_ZOMBIE)
         strcpy (pname, "<defunct>");
-      else if (query != CW_GETPINFO_FULL)
+      else if (p->ppid)
        {
          char *s;
          pname[0] = '\0';
@@ -270,7 +270,7 @@ main (int argc, char *argv[])
          if (s > pname && strcasecmp (s, ".exe") == 0)
            *s = '\0';
        }
-      else
+      else if (query == CW_GETPINFO_FULL)
        {
          HANDLE h = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, p->dwProcessId);
          if (!h)