Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit70e2e3d

Browse files
committed
Improve pginclude tools to process include file usage by other include files.
1 parenta18faa1 commit70e2e3d

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

‎src/tools/pginclude/pgdefine

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
:
22
# create macro calls for all defines in the file
33

4-
# $PostgreSQL: pgsql/src/tools/pginclude/pgdefine,v 1.3 2006/03/11 04:38:42 momjian Exp $
4+
# $PostgreSQL: pgsql/src/tools/pginclude/pgdefine,v 1.4 2006/07/13 16:39:20 momjian Exp $
55

66
trap "rm -f /tmp/$$" 0 1 2 3 15
77
for FILE
88
do
99
cat "$FILE" | grep "^#define" >/tmp/$$
10-
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*\)[ ][ ]*[^ ].*$/(void)\1;/p'
11-
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*([^)]*)\).*$/(=void)\1;/p' |
10+
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*\)[ ][ ]*[^ ].*\\\\$/\1;/p'
11+
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*\)[ ][ ]*[^ ].*[^\\\\]$/(void)\1;/p'
12+
13+
(
14+
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*([^)]*)\).*\\\\$/\1;/p'
15+
cat /tmp/$$ | sed -n 's/^#define[ ][ ]*\([a-zA-Z0-9_]*([^)]*)\).*[^\\\\]$/(=void)\1;/p'
16+
) |
1217
sed 's/([a-zA-Z0-9_ ][a-zA-Z0-9_ ]*)/(0)/g' |
1318
sed 's/([a-zA-Z0-9_ ]*,/(0,/g' |
1419
sed 's/,[a-zA-Z0-9_ ]*,/,0,/g' |

‎src/tools/pginclude/pgrminclude

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:
22
# remove extra #include's
33

4-
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.13 2006/07/12 16:28:27 momjian Exp $
4+
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.14 2006/07/13 16:39:20 momjian Exp $
55

66
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
77
find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
@@ -71,6 +71,8 @@ do
7171
cat /tmp/$$b
7272
cat /tmp/$$.c
7373
fi
74+
grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' \
75+
"$FILE" >/tmp/$$b
7476
mv /tmp/$$b "$FILE"
7577
fi
7678
done

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp