Feedback-ID: i0fe9450f:Fastmail
Date: Thu, 9 Apr 2026 11:10:55 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Postgres hackers <pgsql-hackers@lists.postgresql.org>
Subject: Backpatching make_ctags -e and -n to v15 and v14 
Message-ID: <adcKr7fob5ZvjhlH@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="Y4mm/VKMO819Bt1M"
Content-Disposition: inline
Archived-At: 
 <https://www.postgresql.org/message-id/adcKr7fob5ZvjhlH%40paquier.xyz>
Precedence: bulk


--Y4mm/VKMO819Bt1M
Content-Type: multipart/mixed; boundary="x5uEd7QzM0ODVY9J"
Content-Disposition: inline


--x5uEd7QzM0ODVY9J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

While doing some work on back branches lately, I have been annoyed by
the fact that the improvements done in make_ctags as of d1e2a380cb91
are not available in REL_14_STABLE and REL_15_STABLE.  I don't really
use the -n mode, but the emacs mode covered by -e has been a
time-saver for some time now, and it's sad to have only that available
in v16~.

Would there by any objections in backpatching the attached down to v14
and v15?  This includes d1e2a380cb91, 87f21d2c6890 and ae66716bf3ef.

Opinions or comments?
--
Michael

--x5uEd7QzM0ODVY9J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=0001-Enhance-make_ctags-and-make_etags-v15.patch
Content-Transfer-Encoding: quoted-printable

=46rom 94f85759a81572b17132085754d39498ce04564d Mon Sep 17 00:00:00 2001
=46rom: Tatsuo Ishii <ishii@postgresql.org>
Date: Wed, 19 Oct 2022 12:59:29 +0900
Subject: [PATCH] Enhance make_ctags and make_etags.

make_ctags did not include field members of structs since the commit
964d01ae90c314eb31132c2e7712d5d9fc237331.

For example, in the following field of RestrictInfo:

   Selectivity norm_selec pg_node_attr(equal_ignore);

pg_node_attr was mistakenly interpreted to be the name of the field.
To fix this, add -I option to ctags command if the command is
Exuberant ctags or Universal ctags (for plain old ctags, struct
members are not included in the tags file anyway).

Also add "-e" and "-n" options to make_ctags. The -e option invokes
ctags command with -e option, which produces TAGS file for emacs. This
allows to eliminate duplicate codes in make_etags so that make_etags
just exec make_ctags with -e option.

The -n option allows not to produce symbolic links in each
sub directory (the default is producing symbolic links).

This includes some follow-up fixes: 87f21d2c6890 and ae66716bf3ef.

Author: Yugo Nagata
Reviewers: Alvaro Herrera, Tatsuo Ishii
Discussion: https://postgr.es/m/flat/20221007154442.76233afc7c5b255c4de6528=
a%40sraoss.co.jp
---
 src/tools/make_ctags | 80 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 14 deletions(-)

diff --git a/src/tools/make_ctags b/src/tools/make_ctags
index 9e952ce916f2..ad027c71e3dd 100755
--- a/src/tools/make_ctags
+++ b/src/tools/make_ctags
@@ -1,16 +1,54 @@
 #!/bin/sh
=20
-# src/tools/make_ctags
+# src/tools/make_ctags [-e] [-n]
+# If -e is specified, generate tags files for emacs.
+# If -n is specified, don't create symbolic links of tags file.
+usage=3D"Usage:  $0 [-e][-n]"
+if [ $# -gt 2 ]
+then	echo $usage
+	exit 1
+fi
=20
-command -v ctags >/dev/null || \
+EMACS_MODE=3D
+NO_SYMLINK=3D
+IS_EXUBERANT=3D
+PROG=3D"ctags"
+TAGS_OPT=3D"-a -f"
+TAGS_FILE=3D"tags"
+FLAGS=3D
+IGNORE_IDENTIFIES=3D
+
+while [ $# -gt 0 ]
+do
+	if [ $1 =3D "-e" ]
+	then	EMACS_MODE=3D"Y"
+	elif [ $1 =3D "-n" ]
+	then	NO_SYMLINK=3D"Y"
+	else
+		echo $usage
+		exit 1
+	fi
+	shift
+done
+
+if [ ! "$EMACS_MODE" ]
+then	(command -v ctags >/dev/null) || \
 	{ echo "'ctags' program not found" 1>&2; exit 1; }
+fi
=20
-trap "rm -f /tmp/$$" 0 1 2 3 15
-rm -f ./tags
-
-IS_EXUBERANT=3D""
 ctags --version 2>&1 | grep Exuberant && IS_EXUBERANT=3D"Y"
=20
+if [ "$EMACS_MODE" ]
+then	TAGS_FILE=3D"TAGS"
+	if [ "$IS_EXUBERANT" ]
+	then PROG=3D"ctags -e"
+	else	(command -v etags >/dev/null) || \
+		{ echo "neither 'etags' nor exuberant 'ctags' program not found" 1>&2; e=
xit 1; }
+		PROG=3D"etags"
+		TAGS_OPT=3D"-a -o"
+	fi
+fi
+
 # List of kinds supported by Exuberant Ctags 5.8
 # generated by ctags --list-kinds
 # --c-kinds was called --c-types before 2003
@@ -31,12 +69,23 @@ ctags --version 2>&1 | grep Exuberant && IS_EXUBERANT=
=3D"Y"
=20
 if [ "$IS_EXUBERANT" ]
 then	FLAGS=3D"--c-kinds=3D+dfmstuv"
-else	FLAGS=3D"-dt"
+elif [ ! "$EMACS_MODE" ]
+then	FLAGS=3D"-dt"
 fi
=20
+# Use -I option to ignore a macro
+if [ "$IS_EXUBERANT" ]
+then	IGNORE_IDENTIFIES=3D"-I pg_node_attr+"
+fi
+
+trap "ret=3D$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
+rm -f ./$TAGS_FILE
+
 # this is outputting the tags into the file 'tags', and appending
-find `pwd`/ -type f -name '*.[chyl]' -print |
-	xargs ctags -a -f tags "$FLAGS"
+find `pwd`/ \( -name tmp_install -prune -o -name tmp_check -prune \) \
+	-o \( -name "*.[chly]" -o -iname "*makefile*" -o -name "*.mk" -o -name "*=
=2Ein" \
+	-o -name "*.sql" -o -name "*.p[lm]" \) -type f -print |
+	xargs $PROG $TAGS_OPT $TAGS_FILE $FLAGS $IGNORE_IDENTIFIES
=20
 # Sorting non-Exuberant ctags file allows for fast searching of the tags f=
ile.
 # Since etags file has a header that we cannot sort in with the other entr=
ies
@@ -44,10 +93,13 @@ find `pwd`/ -type f -name '*.[chyl]' -print |
 if [ ! "$IS_EXUBERANT" -a ! "$EMACS_MODE" ]
 then	LC_ALL=3DC
 	export LC_ALL
-	sort tags >/tmp/$$ && mv /tmp/$$ tags
+	sort $TAGS_FILE >/tmp/$$ && mv /tmp/$$ $TAGS_FILE
 fi
=20
-find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -type d -pri=
nt |
-while read DIR
-do	[ "$DIR" !=3D "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/ta=
gs "$DIR"/tags
-done
+# create symbolic links
+if [ ! "$NO_SYMLINK" ]
+then    find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -typ=
e d -print |
+	while read DIR
+	do	[ "$DIR" !=3D "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/$=
TAGS_FILE "$DIR"/$TAGS_FILE
+	done
+fi
--=20
2.53.0


--x5uEd7QzM0ODVY9J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename=0001-Enhance-make_ctags-and-make_etags-v14.patch
Content-Transfer-Encoding: quoted-printable

=46rom 3a00b4cd2a6b0b4ac090fca9563dbff4cc5098ff Mon Sep 17 00:00:00 2001
=46rom: Tatsuo Ishii <ishii@postgresql.org>
Date: Wed, 19 Oct 2022 12:59:29 +0900
Subject: [PATCH] Enhance make_ctags and make_etags.

make_ctags did not include field members of structs since the commit
964d01ae90c314eb31132c2e7712d5d9fc237331.

For example, in the following field of RestrictInfo:

   Selectivity norm_selec pg_node_attr(equal_ignore);

pg_node_attr was mistakenly interpreted to be the name of the field.
To fix this, add -I option to ctags command if the command is
Exuberant ctags or Universal ctags (for plain old ctags, struct
members are not included in the tags file anyway).

Also add "-e" and "-n" options to make_ctags. The -e option invokes
ctags command with -e option, which produces TAGS file for emacs. This
allows to eliminate duplicate codes in make_etags so that make_etags
just exec make_ctags with -e option.

The -n option allows not to produce symbolic links in each
sub directory (the default is producing symbolic links).

This includes some follow-up fixes: 87f21d2c6890 and ae66716bf3ef.

Author: Yugo Nagata
Reviewers: Alvaro Herrera, Tatsuo Ishii
Discussion: https://postgr.es/m/flat/20221007154442.76233afc7c5b255c4de6528=
a%40sraoss.co.jp
---
 src/tools/make_ctags | 89 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 19 deletions(-)

diff --git a/src/tools/make_ctags b/src/tools/make_ctags
index d8d18d1569f9..ad027c71e3dd 100755
--- a/src/tools/make_ctags
+++ b/src/tools/make_ctags
@@ -1,16 +1,54 @@
 #!/bin/sh
=20
-# src/tools/make_ctags
+# src/tools/make_ctags [-e] [-n]
+# If -e is specified, generate tags files for emacs.
+# If -n is specified, don't create symbolic links of tags file.
+usage=3D"Usage:  $0 [-e][-n]"
+if [ $# -gt 2 ]
+then	echo $usage
+	exit 1
+fi
=20
-command -v ctags >/dev/null || \
+EMACS_MODE=3D
+NO_SYMLINK=3D
+IS_EXUBERANT=3D
+PROG=3D"ctags"
+TAGS_OPT=3D"-a -f"
+TAGS_FILE=3D"tags"
+FLAGS=3D
+IGNORE_IDENTIFIES=3D
+
+while [ $# -gt 0 ]
+do
+	if [ $1 =3D "-e" ]
+	then	EMACS_MODE=3D"Y"
+	elif [ $1 =3D "-n" ]
+	then	NO_SYMLINK=3D"Y"
+	else
+		echo $usage
+		exit 1
+	fi
+	shift
+done
+
+if [ ! "$EMACS_MODE" ]
+then	(command -v ctags >/dev/null) || \
 	{ echo "'ctags' program not found" 1>&2; exit 1; }
+fi
=20
-trap "rm -f /tmp/$$" 0 1 2 3 15
-rm -f ./tags
-
-IS_EXUBERANT=3D""
 ctags --version 2>&1 | grep Exuberant && IS_EXUBERANT=3D"Y"
=20
+if [ "$EMACS_MODE" ]
+then	TAGS_FILE=3D"TAGS"
+	if [ "$IS_EXUBERANT" ]
+	then PROG=3D"ctags -e"
+	else	(command -v etags >/dev/null) || \
+		{ echo "neither 'etags' nor exuberant 'ctags' program not found" 1>&2; e=
xit 1; }
+		PROG=3D"etags"
+		TAGS_OPT=3D"-a -o"
+	fi
+fi
+
 # List of kinds supported by Exuberant Ctags 5.8
 # generated by ctags --list-kinds
 # --c-kinds was called --c-types before 2003
@@ -31,24 +69,37 @@ ctags --version 2>&1 | grep Exuberant && IS_EXUBERANT=
=3D"Y"
=20
 if [ "$IS_EXUBERANT" ]
 then	FLAGS=3D"--c-kinds=3D+dfmstuv"
-else	FLAGS=3D"-dt"
+elif [ ! "$EMACS_MODE" ]
+then	FLAGS=3D"-dt"
 fi
=20
+# Use -I option to ignore a macro
+if [ "$IS_EXUBERANT" ]
+then	IGNORE_IDENTIFIES=3D"-I pg_node_attr+"
+fi
+
+trap "ret=3D$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
+rm -f ./$TAGS_FILE
+
 # this is outputting the tags into the file 'tags', and appending
-find `pwd`/ -type f -name '*.[chyl]' -print |
-	xargs ctags -a -f tags "$FLAGS"
+find `pwd`/ \( -name tmp_install -prune -o -name tmp_check -prune \) \
+	-o \( -name "*.[chly]" -o -iname "*makefile*" -o -name "*.mk" -o -name "*=
=2Ein" \
+	-o -name "*.sql" -o -name "*.p[lm]" \) -type f -print |
+	xargs $PROG $TAGS_OPT $TAGS_FILE $FLAGS $IGNORE_IDENTIFIES
=20
-# Exuberant tags has a header that we cannot sort in with the other entries
-# so we skip the sort step
-# Why are we sorting this?  I guess some tag implementation need this,
-# particularly for append mode.  bjm 2012-02-24
-if [ ! "$IS_EXUBERANT" ]
+# Sorting non-Exuberant ctags file allows for fast searching of the tags f=
ile.
+# Since etags file has a header that we cannot sort in with the other entr=
ies
+# we skip the sort step.
+if [ ! "$IS_EXUBERANT" -a ! "$EMACS_MODE" ]
 then	LC_ALL=3DC
 	export LC_ALL
-	sort tags >/tmp/$$ && mv /tmp/$$ tags
+	sort $TAGS_FILE >/tmp/$$ && mv /tmp/$$ $TAGS_FILE
 fi
=20
-find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -type d -pri=
nt |
-while read DIR
-do	[ "$DIR" !=3D "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/ta=
gs "$DIR"/tags
-done
+# create symbolic links
+if [ ! "$NO_SYMLINK" ]
+then    find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -typ=
e d -print |
+	while read DIR
+	do	[ "$DIR" !=3D "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/$=
TAGS_FILE "$DIR"/$TAGS_FILE
+	done
+fi
--=20
2.53.0


--x5uEd7QzM0ODVY9J--

--Y4mm/VKMO819Bt1M
Content-Type: application/pgp-signature; name=signature.asc

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmnXCq8ACgkQnvQgOdby
QH2bHw/+PQDhrYzXPC3YdCGWD5olhY2xQIFaWiZpGaphQ2cIesLQZTfd03czEkhX
03+WbmlpcT2lVSIAPnAv4E8sX9ObENZ6WeBNr9z5oo94V6dPZOsS8xr3kmI9ygqk
z5G0Fk3J1lsitbDucWm+MZ9yLbvOpD0IM1Vv9vTJ8lK3fiK5hdKQu7XkX1boIE9J
/apzl/RGRet02O80JFbXN8K2j5o3t4bPPc3n1X2nKlDEAC2FuW+icw9yQkWT2MNq
fvvi/ngvSHBXNNnq1+9JFrP1jnHiUnB6BNgGlOo6k8A04UzIYUPvjTPoeuw9RueY
/hcWjKr861ChmEHpq+S8QEfZxf2A8Ce6e2iBc/xYTTmuaiwIWQFoNk1Fl/tqLQEW
Sq/q+9XIR0uqR6XXEJmMHO2r4+ZmAAwiZjm31BQWmqIcsGsyl3vVV+t2GOCiGn1G
IRCSQ3j53I14M1tTG4QSE8ZPI9wStGI2cZ/DIcouIUF/9QvtYz/HfTuWALL3QxLl
vGkMmml7UADAdvsbtRaOR1sXXgAMcbbLzqMuESmVjM21+TRu8t1OgIQFwn9OTHkH
0ytTUUW4ye9q5uwaVig4YuVVndNDSIKgtqjw4hUT6m1jaPnuQ6X/hXxv7DbRKCeG
KanR/JlyyWUFUSI1qc10zfr58NBnzJue09nAXsQzB2NETaWWNxk=
=t6i6
-----END PGP SIGNATURE-----

--Y4mm/VKMO819Bt1M--