Merge 2.13 changes back in

git-svn-id: file:///home/jj/hercules.svn/trunk@120 956126f8-22a0-4046-8f4a-272fa8102e63

Author: Jan Jaeger

CHANGES

@@ -1,3 +1,29 @@
+07 May 2001 CMPSC fix - Bernard van der Helm
+07 May 2001 Correct false data exception in CVDG - Jan Jaegerr
+06 May 2001 Fix to Lock Page - Jan Jaeger
+06 May 2001 Complete Storage Key Assist - Jan Jaeger
+06 May 2001 Complete Move Page Facility 2 - Jan Jaeger
+04 May 2001 Correct fbadasd.c syntax error - Greg Smith
+04 May 2001 Correct RRB/RRBE rcpkey - Paul Leisy
+03 May 2001 Try to open FBA emulated device readonly if open for
+            readwrite failed.  Allows Linux/390 to be installed
+            from cdrom - Greg Smith
+03 May 2001 Allow `readonly' to be specified for shadowed ckd or cckd
+            devices.  Base file will be opened O_RDONLY. - Greg Smith
+03 May 2001 Enablement of ISKE/RRBE/SSKE in S/370 mode - Valery Pogonchenko
+03 May 2001 Correction to oldpsw during ifetch - Jan Jaeger
+30 Apr 2001 Correct SIE guest interrupt subclass enablement - Jan Jaeger
+28 Apr 2001 Temporarily intercept move page (SIE) - Jan Jaeger
+28 Apr 2001 Add move page to z/Arch - Jan Jaeger
+28 Apr 2001 Fix RRBE RCP index error - Paul Leisy
+27 Apr 2001 Fix STCM(G) with zero mask - Paul Leisy
+26 Apr 2001 Change unsupported config statements erros to warnings - Jan Jaeger
+26 Apr 2001 Correct old psw during ifetch exception - Paul Leisy
+26 Apr 2001 Correct setting of fetch bit in SSKE under SIE - Paul Leisy
+24 Apr 2001 Fixed ckd2cckd bug for multi-file ckd disks - Greg Smith
+24 Apr 2001 Added error detection code to ckd2cckd and cckd2ckd - Greg Smith
+24 Apr 2001 Fixed potential errors in cckd backwards merge (sf-) - Greg Smith
+24 Apr 2001 Reduced CCKD_MAX_DFWQ_DEPTH to 8 for WIN32 otherwise 32 - Greg Smith
 22 Apr 2001 cckd2ckd not stopping if -cyl specified - Greg Smith
 22 Apr 2001 add ISKE, RRBE and SSKE to 370 mode  - Valery Pogonchenko
 22 Apr 2001 ckd fix Read Count setting index marker - Valery Pogonchenko

_build

@@ -1,2 +1 @@
-#!/bin/bash
 make -f makefile.w32 HOST_ARCH=`uname -m` DEST=/bin install

cckd2ckd.c

@@ -158,12 +158,18 @@ int             limited=0;              /* 1=Limit cyls copied       */
 
     /* read the CKD device header */
     rc = read (ifd, &devhdr, CKDDASD_DEVHDR_SIZE);
+    if (rc != CKDDASD_DEVHDR_SIZE)
+    {
+        fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                 ifile, strerror(errno));
+        exit (2);
+    }
     if (memcmp(devhdr.devid, "CKD_C370", 8) != 0)
     {
         fprintf (stderr,
          "cckd2ckd: input file %s is not a compressed ckd file\n",
          ifile);
-        exit (2);
+        exit (3);
     }
     memcpy (devhdr.devid, "CKD_P370", 8);
 
@@ -179,6 +185,12 @@ int             limited=0;              /* 1=Limit cyls copied       */
 
     /* read the compressed CKD device header */
     rc = read (ifd, &cdevhdr, CCKDDASD_DEVHDR_SIZE);
+    if (rc != CCKDDASD_DEVHDR_SIZE)
+    {
+        fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                 ifile, strerror(errno));
+        exit (4);
+    }
 
     /* check the byte order of the file vs the machine */
     if (((cdevhdr.options & CCKD_BIGENDIAN) != 0 && chk_endian() == 0) ||
@@ -188,7 +200,19 @@ int             limited=0;              /* 1=Limit cyls copied       */
     /* get area for primary lookup table and read it in */
     if (swapend) swapend4 ((unsigned char *)&cdevhdr.numl1tab);
     l1 = malloc (cdevhdr.numl1tab * CCKD_L1ENT_SIZE);
+    if (l1 == NULL)
+    {
+        fprintf (stderr, "lookup table malloc error: %s\n",
+                 strerror(errno));
+        exit (5);
+    } 
     rc = read (ifd, l1, cdevhdr.numl1tab * CCKD_L1ENT_SIZE);
+    if (rc != cdevhdr.numl1tab * CCKD_L1ENT_SIZE)
+    {
+        fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                 ifile, strerror(errno));
+        exit (6);
+    }
     if (swapend)
         for (i = 0; i < cdevhdr.numl1tab; i++)
             swapend4 ((unsigned char *)&l1[i]);
@@ -214,7 +238,19 @@ int             limited=0;              /* 1=Limit cyls copied       */
         else
         {
             rc = lseek (ifd, l1[i], SEEK_SET);
+            if (rc == -1)
+            {
+                fprintf (stderr, "cckd2ckd: %s lseek error: %s\n",
+                         ifile, strerror(errno));
+                exit (7);
+            }
             rc = read (ifd, &l2, CCKD_L2TAB_SIZE);
+            if (rc != CCKD_L2TAB_SIZE)
+            {
+                fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                         ifile, strerror(errno));
+                exit (8);
+            }
         }
         /* find the last used entry in the level 2 table */
         for (j = 255; j > 0; j--)
@@ -256,6 +292,12 @@ int             limited=0;              /* 1=Limit cyls copied       */
     /* get buffers */
     buf = malloc (trksz);
     buf2 = malloc (trksz);
+    if (buf == NULL || buf2 == NULL)
+    {
+        fprintf (stderr, "cckd2ckd: buffer malloc error: %s\n",
+                 strerror(errno));
+        exit (9);
+    }
 
     /* process each entry in the primary lookup table */
     for (i = 0; i * 256 < trks || l1[i] != 0; i++)
@@ -267,7 +309,19 @@ int             limited=0;              /* 1=Limit cyls copied       */
         else
         {
             rc = lseek (ifd, l1[i], SEEK_SET);
+            if (rc == -1)
+            {
+                fprintf (stderr, "cckd2ckd: %s lseek error: %s\n",
+                         ifile, strerror(errno));
+                exit (10);
+            }
             rc = read (ifd, &l2, CCKD_L2TAB_SIZE);
+            if (rc != CCKD_L2TAB_SIZE)
+            {
+                fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                         ifile, strerror(errno));
+                exit (11);
+            }
             if (swapend) /* fix byte order if necessary */
                 for (j = 0; j< 256; j++)
                 {
@@ -279,9 +333,7 @@ int             limited=0;              /* 1=Limit cyls copied       */
 
         /* process each entry in the secondary lookup table */
         for (j = 0;
-
              j < 256 && (i * 256 + j < trks || (l1[i] != 0 && l2[j].pos != 0));
-
              j++)
 
         {
@@ -300,7 +352,7 @@ int             limited=0;              /* 1=Limit cyls copied       */
                         fprintf (stderr,
                                  "cckd2ckd: %s close error: %s\n",
                                  ofile, strerror(errno));
-                        exit(3);
+                        exit(12);
                     }
                     *sfxptr = '0' + fileseq;
                 }
@@ -326,16 +378,17 @@ int             limited=0;              /* 1=Limit cyls copied       */
                     fprintf (stderr,
                              "cckd2ckd: %s open error: %s\n",
                              ofile, strerror(errno));
-                    exit (4);
+                    exit (13);
                 }
+
                 /* write the devhdr */
                 rc = write (ofd, &devhdr, CKDDASD_DEVHDR_SIZE);
                 if (rc != CKDDASD_DEVHDR_SIZE)
                 {
                     fprintf (stderr,
                              "cckd2ckd: %s write error: %s\n",
                              ofile, strerror(errno));
-                    exit (5);
+                    exit (14);
                 }
             }
 
@@ -348,7 +401,21 @@ int             limited=0;              /* 1=Limit cyls copied       */
             else
             {
                 rc = lseek (ifd, l2[j].pos, SEEK_SET);
+                if (rc == -1)
+                {
+                    fprintf (stderr, "cckd2ckd: %s lseek error: %s\n",
+                             ifile, strerror(errno));
+                    exit (15);
+                }
+
                 rc = read (ifd, buf, l2[j].len);
+                if (rc != l2[j].len)
+                {
+                    fprintf (stderr, "cckd2ckd: %s read error: %s\n",
+                             ifile, strerror(errno));
+                    exit (16);
+                }
+
                 /* uncompress the track image */
                 compress = buf[0];
                 buf[0] = 0;
@@ -444,7 +511,7 @@ int             limited=0;              /* 1=Limit cyls copied       */
                 fprintf (stderr,
                          "cckd2ckd: %s write error: %s\n",
                          ofile, strerror(errno));
-                exit (6);
+                exit (17);
             }
 
             /* update status information */
@@ -455,7 +522,7 @@ int             limited=0;              /* 1=Limit cyls copied       */
             {
                 fprintf (stderr,
                          "cckd2ckd: Terminated due to errors\n");
-                exit (7);
+                exit (18);
             }
         }
     }
@@ -472,15 +539,15 @@ int             limited=0;              /* 1=Limit cyls copied       */
         fprintf (stderr,
                  "cckd2ckd: %s close error: %s\n",
                  ofile, strerror(errno));
-        exit(8);
+        exit(19);
     }
     rc = close (ifd);
     if (rc < 0)
     {
         fprintf (stderr,
                  "cckd2ckd: %s close error: %s\n",
                  ifile, strerror(errno));
-        exit(9);
+        exit(20);
     }
 
     if (quiet == 0 || errs > 0)
@@ -509,7 +576,7 @@ void syntax ()
             "     -quiet            quiet mode, don't display status\n"
             "     -validate         validate track images [default]\n"
             "     -novalidate       don't validate track images\n");
-    exit (9);
+    exit (21);
 } /* end function syntax */
 
 int abbrev (char *tst, char *cmp)
@@ -615,10 +682,11 @@ int             kl,dl;                  /* Key/Data lengths          */
     {
         kl = buf[sz+5];
         dl = buf[sz+6] * 256 + buf[sz+7];
+
         /* fix for track overflow bit */
         memcpy (cchh2, &buf[sz], 4); cchh2[0] &= 0x7f;
-        /* fix for funny formatted vm disks */
 
+        /* fix for funny formatted vm disks */
         if (r == 1) memcpy (cchh, cchh2, 4);
 
         if (memcmp (cchh, cchh2, 4) != 0 || buf[sz+4] == 0 ||

cckdcdsk.c

@@ -698,9 +698,9 @@ char *compression[] = {"none", "zlib", "bzip2"};
 
             /* consistency check on level 2 table entry */
             if (trk >= trks ||  l2[j].pos < lopos ||
-                l2[j].pos + l2[j].size > hipos ||
+                l2[j].pos + l2[j].len > hipos ||
                 l2[j].len <= CKDDASD_TRKHDR_SIZE ||
-                l2[j].len > l2[j].size || l2[j].size > trksz)
+                l2[j].len > trksz)
             {
                 sprintf(msg, "l2tab inconsistency track %d", trk);
             bad_trk:
@@ -722,8 +722,8 @@ char *compression[] = {"none", "zlib", "bzip2"};
                     goto validate_l2;
                 }
                 cdskmsg (m, "%s\n"
-                   "  l2[%d,%d] offset 0x%x len %d size %d\n",
-                   msg, i, j, l2[j].pos, l2[j].len, l2[j].size);
+                   "  l2[%d,%d] offset 0x%x len %d\n",
+                   msg, i, j, l2[j].pos, l2[j].len);
                 trkerrs++;
                 invalid_trks++;
                 if (fdflags & O_RDWR)

cckddasd.c

@@ -2528,14 +2528,43 @@ long            len;                    /* Uncompressed trk length   */
     /* make the previous file active */
     cckd->sfn--;
 
+    /* Verify the integrity of the new active file by calling the
+       chkdsk function.  This is especially important if the
+       preceding file was created by cckddump program and made
+       writable for the merge */
+    rc = cckd_chkdsk (cckd->fd[sfx-1], sysblk.msgpipew, 1);
+    if (rc < 0)
+    {
+        logmsg ("cckddasd: cannot remove shadow file [%d], "
+                "file [%d] failed chkdsk\n",
+                sfx, sfx-1);
+        cckd->sfn++;
+        release_lock (&cckd->filelock);
+        return;         
+    }
+
+    /* Re-read the compressed device header, in case chkdsk
+       rebuilt the free space */
+    rc = cckd_read_chdr (dev);
+    if (rc < 0)
+    {
+        logmsg ("cckddasd: cannot remove shadow file [%d], "
+                "file [%d] read cckd devhdr failed\n",
+                sfx, sfx-1);
+        cckd->sfn++;
+        release_lock (&cckd->filelock);
+        return;         
+    }
+
     /* perform backwards merge to a compressed file */
     if (merge && cckd->cdevhdr[sfx-1].size)
     {
+        DEVTRACE ("cckddasd: sfrem merging to compressed file [%d] %s\n",
+                  sfx-1, sfn);
+        cckd->cdevhdr[cckd->sfn].options |= CCKD_OPENED;
         buf = malloc (dev->ckdtrksz);
         for (i = 0; i < cckd->cdevhdr[sfx].numl1tab; i++)
         {
-            DEVTRACE ("cckddasd: sfrem merging to compressed file [%d] %s\n", sfx-1, sfn);
-
             /* get the level 2 tables */
             rc = cckd_read_l2 (dev, sfx, i);
             memcpy (&l2, cckd->l2, CCKD_L2TAB_SIZE);