Cleanups.

2 files changed, 20 insertions, 2 deletions

diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude
new file mode 100755
index 0000000000..f48c96a536
--- /dev/null
+++ b/src/tools/pginclude/pgfixinclude
@@ -0,0 +1,18 @@
+:
+trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
+find . \( -name CVS -a -prune \) -o -type f -print |
+while read FILE
+do
+	cat /tmp/$$a | grep "^#include" |
+	sed 's/^#include[ 	]*[<"]\([^>"]*\).*$/\1/g' |
+	while read INCLUDE
+	do
+		if [ -s /usr/include/"$INCLUDE" ]
+		then	cat "$FILE" |
+			sed 's/^#include[ 	]*[<"]'"$INCLUDE"'[>"]$/#include <'"$INCLUDE"'>/g' >/tmp/$$
+		else	cat "$FILE" |
+			sed 's/^#include[ 	]*[<"]'"$INCLUDE"'[>"]$/#include "'"$INCLUDE"'"/g' >/tmp/$$
+		fi
+		cat /tmp/$$ > "$FILE"
+	done
+done
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
index 37ef46c85a..5fbf553a11 100755
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgnoinclude
@@ -14,7 +14,7 @@ do
 	else	cat "$FILE" >/tmp/$$a
 	fi
 	cat /tmp/$$a | grep "^#include" |
-	sed 's/#include[ 	]*[<"]\([^>"]*\).*$/\1/g' |
+	sed 's/^#include[ 	]*[<"]\([^>"]*\).*$/\1/g' |
 	while read INCLUDE
 	do
 		[ -s /usr/include/$INCLUDE ] && continue
@@ -36,7 +36,7 @@ do
 		if [ "$?" -eq 0 ]
 		then	echo "$FILE $INCLUDE"
 			if [ "$IS_INCLUDE" = "N" ]
-			then	grep -v '#include[ 	]*[<"]$INCLUDE[>"]' $FILE >/tmp/$$b
+			then	grep -v '^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]' $FILE >/tmp/$$b
 				mv /tmp/$$b "$FILE"
 			fi
 			if [ "$1" = "-v" ]