Load blksz, lrecl, and date attributes

t1m0thyj · t1m0thyj · commit 8071a96f4523 · 2025-10-29T14:15:24.000-04:00
Signed-off-by: Timothy Johnson &lt;timothy.johnson@broadcom.com&gt;
diff --git a/native/c/commands/ds.cpp b/native/c/commands/ds.cpp
@@ -382,6 +382,7 @@ int handle_data_set_list(InvocationContext &context)
           fields.push_back(it->volser);
           fields.push_back(it->migr ? "true" : "false");
           fields.push_back(it->recfm);
+          // TODO Add more attributes here
         }
         context.output_stream() << zut_format_as_csv(fields) << endl;
         fields.clear();
@@ -404,10 +405,18 @@ int handle_data_set_list(InvocationContext &context)
       entry->set("name", str(trimmed_name));
       if (attributes)
       {
+        entry->set("cdate", str(it->cdate));
+        entry->set("blksz", i64(it->blksz));
         entry->set("dsorg", str(it->dsorg));
-        entry->set("volser", str(it->volser));
+        entry->set("edate", str(it->edate));
+        entry->set("extx", i64(it->extx));
+        entry->set("lrecl", i64(it->lrecl));
         entry->set("migr", boolean(it->migr));
+        entry->set("ovf", boolean(it->ovf));
+        entry->set("rdate", str(it->rdate));
         entry->set("recfm", str(it->recfm));
+        entry->set("sizex", i64(it->sizex));
+        entry->set("volser", str(it->volser));
       }
       entries_array->push(entry);
     }
diff --git a/native/c/zds.cpp b/native/c/zds.cpp
@@ -744,6 +744,111 @@ void load_recfm_from_dscb(const DSCBFormat1 *dscb, string *recfm)
   }
 }
 
+void load_date_from_dscb(const char *date_in, string *date_out)
+{
+  // Date is in 'YDD' format (3 bytes): Year offset and day of year
+  // If all zeros, date is not maintained
+  unsigned char year_offset = static_cast<unsigned char>(date_in[0]);
+  unsigned char day_high = static_cast<unsigned char>(date_in[1]);
+  unsigned char day_low = static_cast<unsigned char>(date_in[2]);
+
+  // Check if date is zero (not maintained)
+  if (year_offset == 0 && day_high == 0 && day_low == 0)
+  {
+    *date_out = "";
+    return;
+  }
+
+  // Parse year: add 1900 to the year offset
+  int year = 1900 + year_offset;
+
+  // Parse day of year from 2-byte value (big-endian)
+  int day_of_year = (day_high << 8) | day_low;
+
+  // Convert day of year to month/day
+  static const int days_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+  // Check for leap year
+  bool is_leap = (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0);
+
+  int month = 1;
+  int day = day_of_year;
+
+  for (int i = 0; i < 12 && day > days_in_month[i]; i++)
+  {
+    int days_this_month = days_in_month[i];
+    if (i == 1 && is_leap) // February in leap year
+      days_this_month = 29;
+
+    day -= days_this_month;
+    month++;
+  }
+
+  // Format as "YYYY/MM/DD"
+  char buffer[11];
+  sprintf(buffer, "%04d/%02d/%02d", year, month, day);
+  *date_out = buffer;
+}
+
+void load_size_from_dscb(const DSCBFormat1 *dscb, ZDSEntry &entry)
+{
+  // extx: Number of extents on this volume
+  entry.extx = dscb->ds1noepv;
+
+  // Parse the extent information from ds1exnts (3 extents, 10 bytes each)
+  // Each extent has: type(1), seq(1), lower_limit(4), upper_limit(4)
+  const char *extent_data = dscb->ds1exnts;
+  int total_tracks = 0;
+  bool has_overflow = false;
+
+  for (int i = 0; i < 3; i++)
+  {
+    const char *extent = extent_data + (i * 10);
+    uint8_t extent_type = static_cast<uint8_t>(extent[0]);
+
+    // Check if this is a valid extent (not X'00')
+    if (extent_type == 0x00)
+      break;
+
+    // Check for overflow extent (ISAM X'02')
+    if (extent_type & 0x02)
+    {
+      has_overflow = true;
+    }
+
+    // Parse lower limit CCHH (4 bytes)
+    uint16_t lower_cyl_low = (static_cast<unsigned char>(extent[2]) << 8) |
+                             static_cast<unsigned char>(extent[3]);
+    uint16_t lower_cyl_high = (static_cast<unsigned char>(extent[4]) >> 4) & 0x0F;
+    uint16_t lower_head = ((static_cast<unsigned char>(extent[4]) & 0x0F) << 8) |
+                          static_cast<unsigned char>(extent[5]);
+
+    // Parse upper limit CCHH (4 bytes)
+    uint16_t upper_cyl_low = (static_cast<unsigned char>(extent[6]) << 8) |
+                             static_cast<unsigned char>(extent[7]);
+    uint16_t upper_cyl_high = (static_cast<unsigned char>(extent[8]) >> 4) & 0x0F;
+    uint16_t upper_head = ((static_cast<unsigned char>(extent[8]) & 0x0F) << 8) |
+                          static_cast<unsigned char>(extent[9]);
+
+    // Calculate full cylinder numbers (28-bit)
+    uint32_t lower_cyl = (lower_cyl_high << 16) | lower_cyl_low;
+    uint32_t upper_cyl = (upper_cyl_high << 16) | upper_cyl_low;
+
+    // Calculate tracks in this extent
+    if (upper_cyl >= lower_cyl)
+    {
+      int tracks_in_extent = ((upper_cyl - lower_cyl) * 15) + (upper_head - lower_head) + 1;
+      total_tracks += tracks_in_extent;
+    }
+  }
+
+  // sizex: Total tracks allocated
+  entry.sizex = total_tracks;
+
+  // ovf: Overflow indicator
+  entry.ovf = has_overflow;
+}
+
 void zds_get_attrs_from_dscb(ZDS *zds, ZDSEntry &entry)
 {
   auto *dscb = (DSCBFormat1 *)__malloc31(sizeof(DSCBFormat1));
@@ -759,6 +864,14 @@ void zds_get_attrs_from_dscb(ZDS *zds, ZDSEntry &entry)
   {
     load_dsorg_from_dscb(dscb, &entry.dsorg);
     load_recfm_from_dscb(dscb, &entry.recfm);
+    entry.blksz = (static_cast<unsigned char>(dscb->ds1blkl[0]) << 8) |
+                  static_cast<unsigned char>(dscb->ds1blkl[1]);
+    entry.lrecl = (static_cast<unsigned char>(dscb->ds1lrecl[0]) << 8) |
+                  static_cast<unsigned char>(dscb->ds1lrecl[1]);
+    load_date_from_dscb(dscb->ds1credt, &entry.cdate);
+    load_date_from_dscb(dscb->ds1expdt, &entry.edate);
+    load_date_from_dscb(dscb->ds1refd, &entry.rdate);
+    load_size_from_dscb(dscb, entry);
   }
   else
   {
diff --git a/native/c/zds.hpp b/native/c/zds.hpp
@@ -27,10 +27,18 @@ struct ZDSMem
 struct ZDSEntry
 {
   std::string name;
+  int blksz;
+  std::string cdate;
   std::string dsorg;
-  std::string volser;
-  std::string recfm;
+  std::string edate;
+  int extx;
+  int lrecl;
   bool migr;
+  bool ovf;
+  std::string rdate;
+  std::string recfm;
+  int sizex;
+  std::string volser;
 };
 
 typedef struct
diff --git a/native/zowed/schemas/requests.hpp b/native/zowed/schemas/requests.hpp
@@ -1,12 +1,12 @@
-/**
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- *
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
  */
 
 // Code generated by generateTypes.ts. DO NOT EDIT.
diff --git a/native/zowed/schemas/responses.hpp b/native/zowed/schemas/responses.hpp
@@ -1,12 +1,12 @@
-/**
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- *
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
  */
 
 // Code generated by generateTypes.ts. DO NOT EDIT.
@@ -22,7 +22,17 @@ ZJSON_SCHEMA(Dataset,
     FIELD_OPTIONAL(dsorg, STRING),
     FIELD_OPTIONAL(volser, STRING),
     FIELD_OPTIONAL(migr, BOOL),
-    FIELD_OPTIONAL(recfm, STRING)
+    FIELD_OPTIONAL(recfm, STRING),
+    FIELD_OPTIONAL(blksz, NUMBER),
+    FIELD_OPTIONAL(cdate, STRING),
+    FIELD_OPTIONAL(edate, STRING),
+    FIELD_OPTIONAL(extx, NUMBER),
+    FIELD_OPTIONAL(lrecl, NUMBER),
+    FIELD_OPTIONAL(ovf, BOOL),
+    FIELD_OPTIONAL(rdate, STRING),
+    FIELD_OPTIONAL(sizex, NUMBER),
+    FIELD_OPTIONAL(spacu, STRING),
+    FIELD_OPTIONAL(used, NUMBER)
 );
 
 struct DsMember {};
diff --git a/packages/cli/src/list/data-set/DataSet.definition.ts b/packages/cli/src/list/data-set/DataSet.definition.ts
@@ -50,6 +50,14 @@ export const ListDataSetDefinition: ICommandDefinition = {
             required: true,
         },
     ],
+    options: [
+        {
+            name: "attributes",
+            aliases: ["a"],
+            description: "Fetch attributes of the data sets being listed.",
+            type: "boolean",
+        },
+    ],
     profile: { optional: ["ssh"] },
     outputFormatOptions: true,
 };
diff --git a/packages/cli/src/list/data-set/DataSet.handler.ts b/packages/cli/src/list/data-set/DataSet.handler.ts
@@ -19,6 +19,7 @@ export default class ListDataSetsHandler extends SshBaseHandler {
         try {
             response = await client.ds.listDatasets({
                 pattern: params.arguments.pattern,
+                attributes: params.arguments.attributes,
             });
         } catch (err) {
             const errText = (err instanceof ImperativeError ? err.additionalDetails : err.toString()).replace(
@@ -37,6 +38,7 @@ export default class ListDataSetsHandler extends SshBaseHandler {
             response.returnedRows,
             params.arguments.pattern,
         );
+        params.response.data.setObj(response.items);
         params.response.format.output({
             output: response.items,
             format: "table",
diff --git a/packages/sdk/src/doc/rpc/common.ts b/packages/sdk/src/doc/rpc/common.ts
@@ -109,6 +109,46 @@ export interface Dataset {
      * Record format
      */
     recfm?: string;
+    /**
+     * Block size
+     */
+    blksz?: number;
+    /**
+     * Creation date
+     */
+    cdate?: string;
+    /**
+     * Expiration date
+     */
+    edate?: string;
+    /**
+     * Number of extents
+     */
+    extx?: number;
+    /**
+     * Logical record length
+     */
+    lrecl?: number;
+    /**
+     * Overflow indicator
+     */
+    ovf?: boolean;
+    /**
+     * Last referenced date
+     */
+    rdate?: string;
+    /**
+     * Size in extents
+     */
+    sizex?: number;
+    /**
+     * Space allocation units
+     */
+    spacu?: string;
+    /**
+     * Amount of space used
+     */
+    used?: number;
 }
 
 export interface DatasetAttributes {
