readtags: fix the output of the combination of --{list,with}-pseudo-tags and -{A,C}

The behavior of the long options should be the same as -{D,P}.
However, when specifying them with -A or -C, readtags didn't canonicalize
the input field for !_TAG_PROC_CWD pseudo tag.

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Tmain/readtags-canonicalize-input-names.d/run.sh

@@ -33,9 +33,11 @@ run_test good2.tags -C -l &&
 ! run_test drive-letter0.tags --canonicalize-input -l &&
 ! run_test drive-letter1.tags -C -l &&
 run_test good-ptags.tags -C -D &&
+run_test good-ptags.tags -C --list-pseudo-tags &&
 run_test good0.tags -A -l &&
 run_test good1.tags --absolute-input -l &&
 run_test good2.tags -A -l &&
 ! run_test drive-letter0.tags --absolute-input -l &&
 ! run_test drive-letter1.tags -A -l &&
-run_test good-ptags.tags -A -D
+run_test good-ptags.tags -A -D &&
+run_test good-ptags.tags -A --list-pseudo-tags

Tmain/readtags-canonicalize-input-names.d/stderr-expected.txt

@@ -6,6 +6,7 @@
 # drive-letter1.tags -C -l
 !_TAG_PROC_CWD must start with '/': D:/tmp
 # good-ptags.tags -C -D
+# good-ptags.tags -C --list-pseudo-tags
 # good0.tags -A -l
 # good1.tags --absolute-input -l
 # good2.tags -A -l
@@ -14,3 +15,4 @@
 # drive-letter1.tags -A -l
 !_TAG_PROC_CWD must start with '/': D:/tmp
 # good-ptags.tags -A -D
+# good-ptags.tags -A --list-pseudo-tags

Tmain/readtags-canonicalize-input-names.d/stdout-expected.txt

@@ -85,6 +85,19 @@ w_fn	/abc/w.c
 !_TAG_PROGRAM_URL	https://ctags.io/	/official site/
 !_TAG_PROGRAM_VERSION	5.9.0	/e08db39a3/
 !_TAG_PROC_DUMMY	/../../tmp	//
+# good-ptags.tags -C --list-pseudo-tags
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+!_TAG_PROC_CWD	/tmp	//
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	5.9.0	/e08db39a3/
+!_TAG_PROC_DUMMY	/../../tmp	//
 # good0.tags -A -l
 a_fn	/tmp/abc/xyz/a.c
 b_fn	/tmp/abc/b.c
@@ -172,3 +185,16 @@ w_fn	/abc/w.c
 !_TAG_PROGRAM_URL	https://ctags.io/	/official site/
 !_TAG_PROGRAM_VERSION	5.9.0	/e08db39a3/
 !_TAG_PROC_DUMMY	/../../tmp	//
+# good-ptags.tags -A --list-pseudo-tags
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+!_TAG_PROC_CWD	/tmp	//
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	5.9.0	/e08db39a3/
+!_TAG_PROC_DUMMY	/../../tmp	//

extra-cmds/readtags-cmd.c

@@ -708,7 +708,7 @@ extern int main (int argc, char **argv)
 			{
 				if (canon)
 					canon->ptags = 1;
-				listTags (1, &printOpts, NULL);
+				listTags (1, &printOpts, canon);
 				if (optname[0] == 'l')
 					actionSupplied = 1;
 			}