Merge pull request #603 from zowe/bugfix/v2/symbol-for-volser

Adding symbol resolution for volser during obtaindscb1
zowe · Jul 10, 2023 · ba7a6ed · ba7a6ed
2 parents ceaf109 + 35ff53d
commit ba7a6ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@ All notable changes to the ZSS package will be documented in this file.
 ## Recent Changes
 
 ## `2.10.0`
-- Bugfix:  Preventing error code 0C9-09 caused by a block size of zero
+- Bugfix: Datasets with VOLSER set to an MVS Symbol would cause dataset read, write, and metadata API calls to fail for those datasets. (#603)
+- Bugfix:  Preventing error code 0C9-09 caused by a block size of zero (#606)
 
 ## `2.9.0`
 - Bugfix: expose the version of the ZIS dynamic linkage base plugin so it can be updated during a build

diff --git a/c/datasetjson.c b/c/datasetjson.c
@@ -141,7 +141,7 @@ static int getLreclOrRespondError(HttpResponse *response, const DatasetName *dsn
   int handledThroughDSCB = FALSE;
 
   if (!volserSuccess){
-    
+
     char dscb[INDEXED_DSCB] = {0};
     int rc = obtainDSCB1(dsn->value, sizeof(dsn->value),
                          volser.value, sizeof(volser.value),
@@ -714,6 +714,21 @@ static int obtainDSCB1(const char *dsname, unsigned int dsnameLength,
 #define SVC27_OPTION_HIDE_NAME        0x10
 #define SVC27_OPTION_EADSCB_OK        0x08
 
+  char resolvedVolser[VOLSER_SIZE+1] = {0};
+
+  if (volser[0] == '&'){
+    int rc = 0;
+    int rsn = 0;
+    char *result = resolveSymbol(volser, &rc, &rsn);
+    if (result != NULL && rc == 0){
+      snprintf(resolvedVolser, VOLSER_SIZE+1, "%s", result);
+      safeFree(result, strlen(result));
+    } else if (rc) {
+      zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING, "symbol lookup error rc=0x%x rsn=0x%x\n", rc, rsn);
+      return rc;
+    }
+  }
+
   ALLOC_STRUCT31(
     STRUCT31_NAME(mem31),
     STRUCT31_FIELDS(
@@ -734,7 +749,7 @@ static int obtainDSCB1(const char *dsname, unsigned int dsnameLength,
   memset(mem31->dsnameSpacePadded, ' ', sizeof(mem31->dsnameSpacePadded));
   memcpy(mem31->dsnameSpacePadded, dsname, dsnameLength);
   memset(mem31->volserSpacePadded, ' ', sizeof(mem31->volserSpacePadded));
-  memcpy(mem31->volserSpacePadded, volser, volserLength);
+  memcpy(mem31->volserSpacePadded, volser[0] == '&' ? resolvedVolser: volser, volserLength);
 
   memset(mem31->workArea, 0, sizeof(mem31->workArea));
 
@@ -1060,7 +1075,7 @@ static void updateDatasetWithJSONInternal(HttpResponse* response,
 
   int volserSuccess = getVolserForDataset(dsn, &volser);
   if (!volserSuccess){
-    
+
     char dscb[INDEXED_DSCB] = {0};
     int rc = obtainDSCB1(dsn->value, sizeof(dsn->value),
                          volser.value, sizeof(volser.value),