[svn-r12196] Purpose:

bug fix

Description:
h5ls was not printing root group attributes

Solution:

Platforms tested:
linux 32, 64
solaris

Misc. update:

2 files changed, 154 insertions, 0 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 1f73c37..792db23 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2254,6 +2254,16 @@ main (int argc, const char *argv[])
              * group. */
             sym_insert(&sb, oname);
             iter.container = container = fix_name(show_file_name_g?fname:"", oname);
+            /* list root attributes */
+            if (verbose_g>0)
+            {
+             if ((root=H5Gopen(file, "/"))<0) 
+              leave(1); 
+             H5Aiterate(root, NULL, list_attr, NULL);
+             if (H5Gclose(root)<0) 
+              leave(1);
+            }
+            /* list */
             H5Giterate(file, oname, NULL, list, &iter);
             free(container);
 
@@ -2272,3 +2282,4 @@ main (int argc, const char *argv[])
     }
     leave(0);
 }
+
diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls
index b96c201..01ad413 100644
--- a/tools/testfiles/tattr2.ls
+++ b/tools/testfiles/tattr2.ls
@@ -2,6 +2,149 @@
  output for 'h5ls -w80 -v -S tattr2.h5'
 #############################
 Opened "tattr2.h5" with sec2 driver.
+    Attribute: string    {2}
+        Type:      2-byte null-terminated ASCII string
+        Data:  "ab", "de"
+    Attribute: bitfield  {2}
+        Type:      8-bit bitfield
+        Data:  0x01, 0x02
+    Attribute: opaque    {2}
+        Type:      1-byte opaque type
+               (tag = "1-byte opaque type")
+        Data:  0x01, 0x02
+    Attribute: compound  {2}
+        Type:      struct {
+                   "a"                +0    8-bit integer
+                   "b"                +4    IEEE 64-bit little-endian float
+               } 12 bytes
+        Data:  {1, 2}, {3, 4}
+    Attribute: enum      {2}
+        Type:      enum 32-bit little-endian integer {
+                   RED              = 0
+                   GREEN            = 1
+               }
+        Data:  RED, RED
+    Attribute: vlen      {2}
+        Type:      variable length of
+                   32-bit little-endian integer
+        Data:  (1), (2,3)
+    Attribute: array     {2}
+        Type:      [3] 32-bit little-endian integer
+        Data:  [1,2,3], [4,5,6]
+    Attribute: integer   {2}
+        Type:      32-bit little-endian integer
+        Data:  1, 2
+    Attribute: float     {2}
+        Type:      IEEE 32-bit little-endian float
+        Data:  1, 2
+    Attribute: string2D  {3, 2}
+        Type:      2-byte null-terminated ASCII string
+        Data:
+            (0,0) "ab", "cd", "ef", "gh", "ij", "kl"
+    Attribute: bitfield2D {3, 2}
+        Type:      8-bit bitfield
+        Data:
+            (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
+    Attribute: opaque2D  {3, 2}
+        Type:      1-byte opaque type
+               (tag = "1-byte opaque type")
+        Data:
+            (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
+    Attribute: compound2D {3, 2}
+        Type:      struct {
+                   "a"                +0    8-bit integer
+                   "b"                +4    IEEE 64-bit little-endian float
+               } 12 bytes
+        Data:
+            (0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}
+    Attribute: enum2D    {3, 2}
+        Type:      enum 32-bit little-endian integer {
+                   RED              = 0
+                   GREEN            = 1
+               }
+        Data:
+            (0,0) RED, RED, RED, RED, RED, RED
+    Attribute: vlen2D    {3, 2}
+        Type:      variable length of
+                   32-bit little-endian integer
+        Data:
+            (0,0) (0), (1), (2,3), (4,5), (6,7,8), (9,10,11)
+    Attribute: array2D   {3, 2}
+        Type:      [3] 32-bit little-endian integer
+        Data:
+            (0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], [16,17,18]
+    Attribute: integer2D {3, 2}
+        Type:      32-bit little-endian integer
+        Data:
+            (0,0) 1, 2, 3, 4, 5, 6
+    Attribute: float2D   {3, 2}
+        Type:      IEEE 32-bit little-endian float
+        Data:
+            (0,0) 1, 2, 3, 4, 5, 6
+    Attribute: string3D  {4, 3, 2}
+        Type:      2-byte null-terminated ASCII string
+        Data:
+            (0,0,0) "ab", "cd", "ef", "gh", "ij", "kl", "mn", "pq", "rs", "tu",
+            (1,2,0) "vw", "xz", "AB", "CD", "EF", "GH", "IJ", "KL", "MN", "PQ",
+            (3,1,0) "RS", "TU", "VW", "XZ"
+    Attribute: bitfield3D {4, 3, 2}
+        Type:      8-bit bitfield
+        Data:
+            (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+            (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
+            (3,1,0) 0x15, 0x16, 0x17, 0x18
+    Attribute: opaque3D  {4, 3, 2}
+        Type:      1-byte opaque type
+               (tag = "1-byte opaque type")
+        Data:
+            (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+            (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
+            (3,1,0) 0x15, 0x16, 0x17, 0x18
+    Attribute: compound3D {4, 3, 2}
+        Type:      struct {
+                   "a"                +0    8-bit integer
+                   "b"                +4    IEEE 64-bit little-endian float
+               } 12 bytes
+        Data:
+            (0,0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}, {13, 
+            (1,0,0)  14}, {15, 16}, {17, 18}, {19, 20}, {21, 22}, {23, 24},
+            (2,0,0) {25, 26}, {27, 28}, {29, 30}, {31, 32}, {33, 34}, {35, 36},
+            (3,0,0) {37, 38}, {39, 40}, {41, 42}, {43, 44}, {45, 46}, {47, 48}
+    Attribute: enum3D    {4, 3, 2}
+        Type:      enum 32-bit little-endian integer {
+                   RED              = 0
+                   GREEN            = 1
+               }
+        Data:
+            (0,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED,
+            (2,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED
+    Attribute: vlen3D    {4, 3, 2}
+        Type:      variable length of
+                   32-bit little-endian integer
+        Data:
+            (0,0,0) (0), (1), (2), (3), (4), (5), (6,7), (8,9), (10,11),
+            (1,1,1) (12,13), (14,15), (16,17), (18,19,20), (21,22,23),
+            (2,1,0) (24,25,26), (27,28,29), (30,31,32), (33,34,35),
+            (3,0,0) (36,37,38,39), (40,41,42,43), (44,45,46,47), (48,49,50,51),
+            (3,2,0) (52,53,54,55), (56,57,58,59)
+    Attribute: array3D   {4, 3, 2}
+        Type:      [3] 32-bit little-endian integer
+        Data:
+            (0,0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15],
+            (0,2,1) [16,17,18], [19,20,21], [22,23,24], [25,26,27], [28,29,30],
+            (1,2,0) [31,32,33], [34,35,36], [37,38,39], [40,41,42], [43,44,45],
+            (2,1,1) [46,47,48], [49,50,51], [52,53,54], [55,56,57], [58,59,60],
+            (3,1,0) [61,62,63], [64,65,66], [67,68,69], [70,71,72]
+    Attribute: integer3D {4, 3, 2}
+        Type:      32-bit little-endian integer
+        Data:
+            (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+            (2,2,1) 18, 19, 20, 21, 22, 23, 24
+    Attribute: float3D   {4, 3, 2}
+        Type:      IEEE 32-bit little-endian float
+        Data:
+            (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+            (2,2,1) 18, 19, 20, 21, 22, 23, 24
 dset                     Dataset {2/2}
     Attribute: string    {2}
         Type:      2-byte null-terminated ASCII string