Use FreeBSD-specific invocation of /bin/ps

diff --git a/cde/programs/dtlogin/config/_common.ksh.src b/cde/programs/dtlogin/config/_common.ksh.src
index 90154a6abfbf587e317756e2c5d1759984ab7a62..b3b73eaa1c03ab60acf8862f4dee7cacece52114 100644 (file)
--- a/cde/programs/dtlogin/config/_common.ksh.src
+++ b/cde/programs/dtlogin/config/_common.ksh.src
@@ -36,8 +36,10 @@
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
 #elif defined(USL) && (OSMAJORVERSION > 1)
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}')
-#elif defined(linux) || defined(CSRG_BASED)
+#elif defined(linux) || defined(CSRG_BASED) && !defined(__FreeBSD__)
   pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}')
+#elif defined(__FreeBSD__)
+  pexec=$(LC_TIME=C /bin/ps -o comm= -p $PPID 2>/dev/null)
 #else
   pexec=$(LC_TIME=C /usr/bin/ps -p $PPID | awk 'NR==2 {print $4}')
 #endif

diff --git a/cde/programs/dtprintinfo/util/Process.C b/cde/programs/dtprintinfo/util/Process.C
index 9dc93ce0ae053d517c8f35188155c69984d73f37..51e91154590afb7a2d1e6e9e68aff8549b1d94ed 100644 (file)
--- a/cde/programs/dtprintinfo/util/Process.C
+++ b/cde/programs/dtprintinfo/util/Process.C
@@ -38,6 +38,8 @@ Process::Process()
 {
 #ifdef aix
    (void)Invoke("ps -e -F \"pid ppid uid command\"", &procs);
+#elif defined(__FreeBSD__)
+   (void)Invoke("/bin/ps ax -o pid,ppid,uid,comm", &procs);
 #else
    (void)Invoke("/bin/ps -el | awk '{printf(\"%s %s %s %s\\n\",$4,$5,$3,$NF)}'",
                &procs);