X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=phier;h=cc6387f9351aa8dd2ec6689801ecdf14f46fdc1c;hp=f2aad9f0be4f9c814f7a63787b44c8ab4f288b4f;hb=030fc36e879a4ce70a43d36d6c43750edfd88341;hpb=4cd9f7b6529675906304b143cd45810577021ade

diff --git a/phier b/phier
index f2aad9f..cc6387f 100755
--- a/phier
+++ b/phier
@@ -1,9 +1,27 @@
 #!/bin/bash
+#
+# $Id$
+#
+# phier: Show process tree incorporating a process.
+# Notes: phier functions similarly (but not identically) to Solaris ptree.
+# Usage: phier [-s <search>] <pid>
+# Usage: phier [-s <search>] [-u <user>] [-x] <process>
+# Options: -s <search>   Stop hierarchy at this process name.
+#          -u <user>     Start search from processes owned by user.
+#          -x            Match process name exactly.
+# Example: phier -s sshd $$
+# Example: phier -s sshd -u iain nxagent
+#
 
 function find_parent() {
   child="$1"; shift
   top="$1"; shift
 
+  if [ -z "$child" ]; then
+    echo >&2 "No child to find."
+    return 1
+  fi
+
   cmd=$(ps -o comm= -p $child)
   pid=$(ps -o pid= -p $child)
   ppid=$(ps -o ppid= -p $child)
@@ -22,7 +40,7 @@ function find_parent() {
     fi
   fi
 
-  if [ $ppid = 1 ]; then
+  if [ $pid = 1 -o $ppid = 1 ]; then
     echo $pid
     return 0
   fi
@@ -31,18 +49,44 @@ function find_parent() {
   return $?
 }
 
+# Parse arguments.
+children=
+top=
+pgrep_opts=
+while getopts ":s:u:x" opt; do
+  case $opt in
+    s) top="$OPTARG";;
+    u) pgrep_opts="$pgrep_opts -u $OPTARG";;
+    x) pgrep_opts="$pgrep_opts -x"
+  esac
+done
+shift $((OPTIND-1))
+
 if [ $# -lt 1 ]; then
   echo >&2 "phier: Print process hierarchy for a process."
-  echo >&2 "Usage: phier <pid> [<search>]"
-  echo >&2 "Notes: If a search term is given the hierarchy will stop after finding a"
-  echo >&2 "       process matching that search term."
-  echo >&2 "Example: phier $$ sshd"
+  echo >&2 "Usage: phier [-s <search>] <pid>"
+  echo >&2 "Usage: phier [-s <search>] [-u <user>] [-x] <process>"
+  echo >&2 "Options: -s <search>   Stop hierarchy at this process name."
+  echo >&2 "         -u <user>     Start search from processes owned by user."
+  echo >&2 "         -x            Match process name exactly."
+  echo >&2 "Example: phier -s sshd $$"
+  echo >&2 "Example: phier -s sshd -u iain nxagent"
   exit 1
 fi
 
-parent=$(find_parent ${1+"$@"})
-if [ $? = 0 ]; then
-  pstree -ulap $parent
-else
-  exit 1
+children="$1"; shift
+if ! echo "$children" | grep -qs '^[0-9]*$'; then
+  children=$(pgrep $pgrep_opts "$children")
 fi
+
+errors=0
+for child in $children; do
+  parent=$(find_parent "$child" "$top")
+  if [ $? = 0 ]; then
+    pstree -ulap $parent
+  else
+    errors=$((errors+1))
+  fi
+done
+
+exit $errors