[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-269-ge8a80e2

[Dave H. <hel...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  e8a80e2cf2318dde85c75be2e6e0669eee0f9849 (commit)
      from  80ea81cb2581fb8c51506a7233e70799e0763bc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8a80e2cf2318dde85c75be2e6e0669eee0f9849
Author: Dave Heller <hel...@us...>
Date:   Fri May 25 21:53:07 2012 -0400

    [ 3529879 ] Fixes for sfcb-ps test script

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 5792064..0d8af75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-25  Dave Heller <hel...@us...>
+
+	* extra/sfcb-ps:
+	[ 3529879 ] Fixes for sfcb-ps test script
+
 2012-05-25  Chris Buccella  <buc...@li...>
 
 	* msgqueue.c:
diff --git a/NEWS b/NEWS
index 6da8d76..6af9eee 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bugs fixed:
 - 3516167 Force kill sfcbd on stop if needed
 - 2966659 Cleanup https daemon remnants
 - 3527674 Faster Startup
+- 3529879 Fixes for sfcb-ps test script
 
 Changes in 1.4.2
 ================
diff --git a/extra/sfcb-ps b/extra/sfcb-ps
index ba15f95..0a24901 100755
--- a/extra/sfcb-ps
+++ b/extra/sfcb-ps
@@ -124,10 +124,10 @@ done
 
 if [ -n "$USE_PROC" ] ; then
    # For busybox ps
-   PS_INFO=$(ps | grep '[s]fcbd')
+   PS_INFO=$(ps | grep '[s]fcbd\b')
 else
    # Get everything from (standard) ps command
-   PS_INFO=$(ps -e -o pid,ppid,pgid,stat,cmd | grep '[s]fcbd')
+   PS_INFO=$(ps -e -o pid,ppid,pgid,stat,cmd | grep '[s]fcbd\b')
 fi
 
 if [ -n "$RAW_PS" ] ; then
@@ -175,7 +175,8 @@ echo "$PS_INFO" | while read pid ppid pgid stat cmd ; do
         SOCKET_TEST="`cat /proc/net/tcp* | grep ":176[45]" | \
           grep -o '\:\([0-9,A-F]\{8\} \)\{2\}\( *[0-9]*\)\{3\}' | \
           grep -o ' [0-9]*$' | \
-          while read inode; do ls -l /proc/$pid/fd/ | grep $inode; done`"
+          while read inode; do [ $inode -ne 0 ] && \
+          ls -l /proc/$pid/fd/ | grep $inode; done`"
     else
         # Use standard lsof for socket test
         SOCKET_TEST="`lsof -n -w -a -i :5988 -i :5989 -p $pid`"


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker