--- cvs_ltp.orig/testcases/kernel/ipc/ipc_stress/cleanup	2008-09-08 10:17:46.000000000 +0800
+++ cvs_ltp/testcases/kernel/ipc/ipc_stress/cleanup	2008-09-17 13:16:42.000000000 +0800
@@ -1,19 +1,22 @@
 #!/bin/sh
  
-SEMS=`ipcs -sp | awk '{printf " %d", $1}' | sed -e 's/ 0//g'`
-if test "$SEMS" != ""; then
-        echo ipcrm sem $SEMS
-        ipcrm sem $SEMS
-fi
+SEMS=`ipcs -s | awk '{printf " %d", $2}' | sed -e 's/ 0//g'`
+for SEM_IDS in $SEMS
+do 
+	echo "ipcrm -s $SEM_IDS"
+	ipcrm -s $SEM_IDS 
+done
  
-MSGS=`ipcs -qp | awk '{printf " %d", $1}' | sed -e 's/ 0//g'`
-if test "$MSGS" != ""; then
-        echo ipcrm msg $MSGS
-        ipcrm msg $MSGS
-fi
- 
-SHMS=`ipcs -mp | awk '{printf " %d", $1}' | sed -e 's/ 0//g'`
-if test "$SHMS" != ""; then
-        echo ipcrm shm $SHMS
-        ipcrm shm $SHMS
-fi
+MSGS=`ipcs -q | awk '{printf " %d", $2}' | sed -e 's/ 0//g'`
+for MSG_IDS in $MSGS
+do
+	echo "ipcrm -q $MSG_IDS"
+	ipcrm -q $MSG_IDS
+done
+
+SHMS=`ipcs -m | awk '{printf " %d", $2}' | sed -e 's/ 0//g'`
+for SHM_IDS in $SHMS
+do
+	echo "ipcrm -m $SHM_IDS"
+	ipcrm -m $SHM_IDS 
+done