9 files changed, 46 insertions, 9 deletions
diff --git a/tools/testfiles/tall-2.ls b/tools/testfiles/tall-2.ls
index 2e4cd37..983f515 100644
--- a/tools/testfiles/tall-2.ls
+++ b/tools/testfiles/tall-2.ls
@@ -16,9 +16,9 @@
     Data:
         (0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 /g1/g1.2                 Group
-/g1/g1.2/extlink         -> file: somefile    path: somepath
+/g1/g1.2/extlink         External Link {somefile//somepath} {**NOT FOUND**}
 /g1/g1.2/g1.2.1          Group
-/g1/g1.2/g1.2.1/slink    -> somevalue
+/g1/g1.2/g1.2.1/slink    Soft Link {somevalue}
 /g2                      Group
 /g2/dset2.1              Dataset {10}
     Data:
@@ -27,4 +27,4 @@
     Data:
         (0,0) 0, 0.1, 0.2, 0.3, 0.4, 0, 0.2, 0.4, 0.6, 0.8, 0, 0.3, 0.6, 0.9,
         (2,4) 1.2
-/g2/udlink               -> cannot follow UD links
+/g2/udlink               UD Link {cannot follow UD links}
diff --git a/tools/testfiles/textlink-1.ls b/tools/testfiles/textlink-1.ls
index 87be5a7..aae806e 100644
--- a/tools/testfiles/textlink-1.ls
+++ b/tools/testfiles/textlink-1.ls
@@ -2,5 +2,5 @@
  output for 'h5ls -w80 -r textlink.h5'
 #############################
 /                        Group
-/extlink1                -> file: filename    path: objname
-/extlink2                -> file: anotherfile    path: anotherobj
+/extlink1                External Link {filename//objname} {**NOT FOUND**}
+/extlink2                External Link {anotherfile//anotherobj} {**NOT FOUND**}
diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/testfiles/textlinksrc-1.ls
new file mode 100644
index 0000000..44b8948
--- /dev/null
+++ b/tools/testfiles/textlinksrc-1.ls
@@ -0,0 +1,17 @@
+#############################
+ output for 'h5ls -w80 -r textlinksrc.h5'
+#############################
+/                        Group
+/ext_link1               External Link {textlinktar.h5//group} {Group}
+/ext_link1/dset          Dataset {6}
+/ext_link1/elink_t1      External Link {textlinksrc.h5//} {Group}
+/ext_link1/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited}
+/ext_link1/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}}
+/ext_link1/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type}
+/ext_link1/elink_t1/ext_link4 External Link {textlinktar.h5//group/elink_t2} {**NOT FOUND**}
+/ext_link1/elink_t1/ext_link5 External Link {textlinktar.h5//empty_group} {Group}
+/ext_link1/elink_t2      External Link {textlinksrc.h5//ext_link4} {**NOT FOUND**}
+/ext_link2               External Link {textlinktar.h5//dset} {Already Visited}
+/ext_link3               External Link {textlinktar.h5//type} {Already Visited}
+/ext_link4               External Link {textlinktar.h5//group/elink_t2} {Already Visited}
+/ext_link5               External Link {textlinktar.h5//empty_group} {Already Visited}
diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/testfiles/textlinksrc-2.ls
new file mode 100644
index 0000000..da40ed7
--- /dev/null
+++ b/tools/testfiles/textlinksrc-2.ls
@@ -0,0 +1,8 @@
+#############################
+ output for 'h5ls -w80 -rv textlinksrc.h5/ext_link5'
+#############################
+Opened "textlinksrc.h5" with sec2 driver.
+ext_link5                External Link {textlinktar.h5//empty_group} {Group
+    Location:  3:1832
+    Links:     1
+}
diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/testfiles/textlinksrc-3.ls
new file mode 100644
index 0000000..91ff216
--- /dev/null
+++ b/tools/testfiles/textlinksrc-3.ls
@@ -0,0 +1,12 @@
+#############################
+ output for 'h5ls -w80 -r textlinksrc.h5/ext_link1'
+#############################
+ext_link1                External Link {textlinktar.h5//group} {Group}
+/dset                    Dataset {6}
+/elink_t1                External Link {textlinksrc.h5//} {Group}
+/elink_t1/ext_link1      External Link {textlinktar.h5//group} {Already Visited}
+/elink_t1/ext_link2      External Link {textlinktar.h5//dset} {Dataset {6}}
+/elink_t1/ext_link3      External Link {textlinktar.h5//type} {Type}
+/elink_t1/ext_link4      External Link {textlinktar.h5//group/elink_t2} {**NOT FOUND**}
+/elink_t1/ext_link5      External Link {textlinktar.h5//empty_group} {Group}
+/elink_t2                External Link {textlinksrc.h5//ext_link4} {**NOT FOUND**}
diff --git a/tools/testfiles/textlinksrc.h5 b/tools/testfiles/textlinksrc.h5
new file mode 100644
index 0000000..062acbe
--- /dev/null
+++ b/tools/testfiles/textlinksrc.h5
diff --git a/tools/testfiles/textlinktar.h5 b/tools/testfiles/textlinktar.h5
new file mode 100644
index 0000000..bf009eb
--- /dev/null
+++ b/tools/testfiles/textlinktar.h5
diff --git a/tools/testfiles/tslink-1.ls b/tools/testfiles/tslink-1.ls
index 4c16958..6c3467a 100644
--- a/tools/testfiles/tslink-1.ls
+++ b/tools/testfiles/tslink-1.ls
@@ -2,5 +2,5 @@
  output for 'h5ls -w80 -r tslink.h5'
 #############################
 /                        Group
-/slink1                  -> somevalue
-/slink2                  -> linkvalue
+/slink1                  Soft Link {somevalue}
+/slink2                  Soft Link {linkvalue}
diff --git a/tools/testfiles/tudlink-1.ls b/tools/testfiles/tudlink-1.ls
index b8578ce..d34ef4d 100644
--- a/tools/testfiles/tudlink-1.ls
+++ b/tools/testfiles/tudlink-1.ls
@@ -2,5 +2,5 @@
  output for 'h5ls -w80 -r tudlink.h5'
 #############################
 /                        Group
-/udlink1                 -> cannot follow UD links
-/udlink2                 -> cannot follow UD links
+/udlink1                 UD Link {cannot follow UD links}
+/udlink2                 UD Link {cannot follow UD links}