[svn-r24049] Bring revisions #23988 - 24002 from trunk to revise_chunks.

h5committested.

10 files changed, 226 insertions, 184 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 3a4864e..2a59a32 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,3 +125,11 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
diff --git a/tools/testfiles/tall-7.ddl b/tools/testfiles/tall-7.ddl
new file mode 100644
index 0000000..f0ad5ea
--- /dev/null
+++ b/tools/testfiles/tall-7.ddl
@@ -0,0 +1,9 @@
+HDF5 "tall.h5" {
+ATTRIBUTE "attr1" {
+   DATATYPE  H5T_STD_I8BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   DATA {
+   (0): 97, 98, 99, 100, 101, 102, 103, 104, 105, 0
+   }
+}
+}
diff --git a/tools/testfiles/tall-7N.ddl b/tools/testfiles/tall-7N.ddl
new file mode 100644
index 0000000..cba5774
--- /dev/null
+++ b/tools/testfiles/tall-7N.ddl
@@ -0,0 +1,17 @@
+HDF5 "tall.h5" {
+ATTRIBUTE "attr1" {
+   DATATYPE  H5T_STD_I8BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   DATA {
+   (0): 97, 98, 99, 100, 101, 102, 103, 104, 105, 0
+   }
+}
+ATTRIBUTE "attr1" {
+   DATATYPE  H5T_STD_I8BE
+   DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
+   DATA {
+   (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111,
+   (15): 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
+   }
+}
+}
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index e8df31c..1ad1249 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: missing file name
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index c27e0ce..1468ad1 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Bad mask list(0,2,2,1,0,2,2,)
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index 58c0e05..557f2a7 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Packed Bit offset+length value(65) too large. Max is 64
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 8a93cbc..342e4e8 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Packed Bit length value(0) must be positive.
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 21c5af4..eb569d2 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Too many masks requested (max. 8). Mask list(0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1)
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 52d901d..a00b561 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Packed Bit offset value(64) must be between 0 and 63
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 82b6c88..aa6e79b 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -2,20 +2,6 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h,   --help         Print a usage message and exit
      -V,   --version      Print version number and exit
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
 --------------- File Options ---------------
      -n,   --contents     Print a list of the file contents and exit
                           Optional value 1 also prints attributes.
@@ -35,6 +21,8 @@ usage: h5dump [OPTIONS] files
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
      -t P, --datatype=P   Print the specified named datatype
+     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
+                          P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
 --------------- Object Property Options ---------------
@@ -47,6 +35,20 @@ usage: h5dump [OPTIONS] files
                           the data value and length is the number of bits of
                           the mask.
      -R,   --region       Print dataset pointed by region references
+--------------- Formatting Options ---------------
+     -e,   --escape       Escape non printing characters
+     -r,   --string       Print 1-byte integer datasets as ASCII
+     -y,   --noindex      Do not print array indices with the data
+     -m T, --format=T     Set the floating point output format
+     -q Q, --sort_by=Q    Sort groups and attributes by index Q
+     -z Z, --sort_order=Z Sort groups and attributes by order Z
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+     --no-compact-subset  Disable compact form of subsetting and allow the use
+                          of "[" in dataset names.
+     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
+                          sets the number of columns to the maximum (65535).
+                          Default width is 80 columns.
 --------------- XML Options ---------------
      -x,   --xml          Output in XML using Schema
      -u,   --use-dtd      Output in XML using DTD
@@ -77,15 +79,7 @@ usage: h5dump [OPTIONS] files
       the file driver flag, the file will be opened with each driver in
       turn and in the order specified above until one driver succeeds
       in opening the file.
-      These are the letters that are appended to the file name(without .h5) when opening
-      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
-         m: All meta data when using the split driver.
-         s: The userblock, superblock, and driver info block
-         b: B-tree nodes
-         r: Dataset raw data
-         g: Global heap
-         l: local heap (object names)
-         o: object headers
+      See examples below for family, split, and multi driver special file name usage.
 
   F - is a filename.
   P - is the full path from the root group to the object.
@@ -131,4 +125,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /foo -f split splitfile
 
+  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
+
+      h5dump -d /foo -f multi mf
+
+  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
+
+      h5dump -d /foo -f family fam%05d.h5
+
 h5dump error: Bad mask list(-1,1)