From: Jorrit Herder <jnherder@minix3.org>
Date: Fri, 24 Jun 2005 16:19:21 +0000 (+0000)
Subject: Changed kernel process table format affected ps.
X-Git-Tag: v3.1.0~709
X-Git-Url: http://zhaoyanbai.com/repos/named.html?a=commitdiff_plain;h=f336ce29bbf3160959316b1c4915df67ac60c4c5;p=minix.git

Changed kernel process table format affected ps.
New mkdep.sh script and affected Makefile.
---

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 2c97f4e29..5438f86cd 100644
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -461,7 +461,7 @@ struct pstat *bufp;
 
   if (p_nr < -nr_tasks || p_nr >= nr_procs) return -1;
 
-  if ((ps_proc[p_ki].p_type == P_NONE)
+  if ((ps_proc[p_ki].p_flags == SLOT_FREE)
   				&& !(ps_mproc[p_nr].mp_flags & IN_USE))
 	return -1;
 
diff --git a/commands/scripts/Makefile b/commands/scripts/Makefile
index 7da3de61b..aa948baae 100755
--- a/commands/scripts/Makefile
+++ b/commands/scripts/Makefile
@@ -31,6 +31,7 @@ usr:	\
 	/usr/bin/clear \
 		/usr/bin/clr \
 	/usr/bin/makewhatis \
+	/usr/bin/mkdep \
 	/usr/bin/mkdist \
 	/usr/bin/setup \
 	/usr/bin/spell \
@@ -94,6 +95,9 @@ clean:
 /usr/bin/makewhatis:	makewhatis.sh
 	install -m 755 -c -o bin $? $@
 
+/usr/bin/mkdep:	mkdep.sh
+	install -m 755 -c -o bin $? $@
+
 /usr/bin/mkdist:	mkdist.sh
 	install -m 755 -c -o bin $? $@
 
diff --git a/commands/scripts/mkdep.sh b/commands/scripts/mkdep.sh
new file mode 100644
index 000000000..6b5fc7d84
--- /dev/null
+++ b/commands/scripts/mkdep.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+#	mkdep 1.1 - Generate Makefile dependencies.	Author: Kees J. Bot
+#
+# Does what 'cc -M' should do, but no compiler gets it right, they all
+# strip the leading path of the '.o' file.)
+#
+# Added option to generate .depend files in subdirectories of given dir.
+# 							Jorrit N. Herder
+
+case $# in
+
+# Display help ...
+0)	
+	echo "Usage: mkdep 'cpp command' file ..." >&2
+	echo "       mkdep directory" >&2
+;;
+
+# Create .depend files ...
+1)
+	echo "Creating .depend files in $1"
+	for dir in `find $1 -type d ! -name CVS`
+	do
+		touch $dir/.depend
+	done
+
+;;
+
+
+# Get dependencies ... 
+*)
+	cpp="$1"; shift
+
+	for f
+	do
+		: < "$f" || exit
+
+		o=`expr "$f" : '\(.*\)\..*'`.o
+
+		echo
+
+		$cpp "$f" | \
+			sed -e '/^#/!d
+				s/.*"\(.*\)".*/\1/
+				s:^\./::' \
+			    -e "s:^:$o\:	:" | \
+			sort -u
+	done
+esac
+
+exit 0
+
+#
+# $PchId: mkdep.sh,v 1.3 1998/07/23 21:24:38 philip Exp $
+#