From 7d9a8b69af4cd21078f881eeb267c1ff650d86b1 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 23 Feb 2013 12:45:45 -0800
Subject: [PATCH] tools.ps: Use unix.linux.proc for parsing.

---
 basis/tools/ps/ps.factor | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/basis/tools/ps/ps.factor b/basis/tools/ps/ps.factor
index 50240acfcb..f0c7125909 100644
--- a/basis/tools/ps/ps.factor
+++ b/basis/tools/ps/ps.factor
@@ -1,32 +1,23 @@
 ! Copyright (C) 2012 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs io.directories io.encodings.utf8 io.files
-io.pathnames kernel math.parser prettyprint sequences splitting
-unicode.categories ;
+USING: accessors assocs io.directories io.pathnames kernel
+math.parser prettyprint sequences splitting unix.linux.proc ;
 IN: tools.ps
 
-! Only in Linux 3
-: ps-comm ( path -- string )
-    "/comm" append utf8 file-contents "\0" split " " join
-    [ blank? ] trim "[" "]" surround ;
-
-: parse-stat ( string -- program-name )
-    " " split
-    second
-    [ CHAR: ( = ] trim-head
-    [ CHAR: ) = ] trim-tail 
-    "[" "]" surround ;
-
-: ps-stat ( path -- string )
-    "/stat" append utf8 file-contents parse-stat ;
-
+! If cmdline is empty, read the filename from /proc/pid/stat
 : ps-cmdline ( path -- path string )
-    dup "/cmdline" append utf8 file-contents
-    [ dup ps-stat ] [ "\0" split " " join ] if-empty ;
+    dup parse-proc-pid-cmdline [
+        dup parse-proc-pid-stat filename>>
+        [ "()" member? ] trim
+        "[" "]" surround
+    ] [
+        "\0" split " " join
+    ] if-empty ;
 
 : ps ( -- assoc )
     "/proc" [
-        "." directory-files [ file-name string>number ] filter
+        "." directory-files
+        [ file-name string>number ] filter
         [ ps-cmdline ] { } map>assoc
     ] with-directory ;