diff options
Diffstat (limited to 'src/tools/pginclude')
| -rwxr-xr-x | src/tools/pginclude/pgfixinclude | 6 | ||||
| -rwxr-xr-x | src/tools/pginclude/pgnoinclude | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude index f48c96a536..b3ebb2df42 100755 --- a/src/tools/pginclude/pgfixinclude +++ b/src/tools/pginclude/pgfixinclude @@ -3,15 +3,15 @@ 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" | + cat "$FILE" | 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/$$ + sed 's;^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]$;#include <'"$INCLUDE"'>;g' >/tmp/$$ else cat "$FILE" | - sed 's/^#include[ ]*[<"]'"$INCLUDE"'[>"]$/#include "'"$INCLUDE"'"/g' >/tmp/$$ + sed 's;^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]$;#include "'"$INCLUDE"'";g' >/tmp/$$ fi cat /tmp/$$ > "$FILE" done diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude index 5fbf553a11..35f191fa6a 100755 --- a/src/tools/pginclude/pgnoinclude +++ b/src/tools/pginclude/pgnoinclude @@ -36,8 +36,14 @@ 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" + # reload after #include removal + if [ "$IS_INCLUDE" = "Y" ] + then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | + grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a + else cat "$FILE" >/tmp/$$a + fi fi if [ "$1" = "-v" ] then cat /tmp/$$ |