version 2.17.1

What's new in release 2.17.1 Release date: 12 February 2003 * Corrected RPM installed files permissions (John Summerfield) * Corrected dasdload verbosity level (Jay Maynard) * Corrected card reader eof/intrq option handling, added * to designate no file loaded (Jay Maynard) * Correct SLB instruction condition code (Jan Jaeger) * Fix dasdutil.c track conversion function (Jim Morrison)
rbowler · Jun 19, 2012 · 80613a8 · 80613a8
1 parent c44f67e
commit 80613a8
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 80 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+08 Feb 2003 Fix dasdload message verbosity test (was backwards) - Jay
+            Maynard
+08 Feb 2003 Fix eof/intrq mode saving in card reader initialization, add *
+            to specify no file loaded - Jay Maynard
+04 Feb 2003 Fix to dasdutil.c convert_tt - Jim Morrison (by Greg)
+04 Feb 2003 Correct condition code on SLB instructions - Jan Jaeger
 01 Feb 2003 Add changes for Mac OS X support - Paul Scott
 01 Feb 2003 Fix dasdinit wrong trk 0 size - Greg Smith + sidmuc
 31 Jan 2003 Command reject if path assignment is not supported (non-3480
@@ -23,7 +29,8 @@
 07 Jan 2003 Fix/recover possible cckd corruption - Greg Smith
 07 Jan 2003 Add Region Relocate, I/O- External- and Wait-assists - Jan Jaeger
 06 Jan 2003 delay exit in config.c to give time to display message - Fish
-06 Jan 2003 minor changes to tapedev.c read_omadesc function - JCS
+06 Jan 2003 minor changes to tapedev.c read_omadesc function - John
+            Summerfield
 06 Jan 2003 Pre-init residual to zero in tapedev execute_ccw -
             freige@fibertel.com.ar by Fish
 06 Jan 2003 Fix to 'unbind_device' to remove listening socket from panel

diff --git a/cardrdr.c b/cardrdr.c
@@ -235,7 +235,12 @@ int     fc;                             /* File counter              */
 
         if (!sockdev)
         {
-            if (access(argv[0], R_OK | F_OK) != 0)
+            /* Check for specification of no file mounted on reader */
+            if (argv[0][0] == '*')
+            {
+                dev->filename[0] = '\0';
+            }
+            else if (access(argv[0], R_OK | F_OK) != 0)
             {
                 logmsg (_("HHCRD010E Unable to access file \"%s\": %s\n"),
                     argv[0], strerror(errno));
@@ -292,7 +297,7 @@ static void cardrdr_query_device (DEVBLK *dev, BYTE **class,
     *class = "RDR";
 
     snprintf (buffer, buflen, "%s%s%s%s%s%s%s%s",
-        dev->filename,
+        ((dev->filename[0] == '\0') ? "*"          : (char *)dev->filename),
         (dev->bs ?                    " sockdev"   : ""),
         (dev->multifile ?             " multifile" : ""),
         (dev->ascii ?                 " ascii"     : ""),
@@ -356,7 +361,7 @@ static int clear_cardrdr ( DEVBLK *dev )
         dev->multifile = 0;
         dev->ascii = 0;
         dev->ebcdic = 0;
-        dev->rdreof = 0;
+//        dev->rdreof = 0;
         dev->trunc = 0;
         dev->autopad = 0;
     }

diff --git a/configure b/configure
@@ -1473,7 +1473,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=hercules
- VERSION=2.17
+ VERSION=2.17.1
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(hercules.h)
 AC_CONFIG_AUX_DIR(autoconf)
 
-AM_INIT_AUTOMAKE(hercules,2.17)
+AM_INIT_AUTOMAKE(hercules,2.17.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

diff --git a/dasdload.c b/dasdload.c
@@ -31,11 +31,11 @@
 #define CASERET(s)      case s: return (#s)
 #define XMINF(lvl,format) \
         do { \
-        if(infolvl<lvl) fprintf(stdout, _(format)); \
+        if(infolvl>=lvl) fprintf(stdout, _(format)); \
         } while(0)
 #define XMINFF(lvl,format,a...) \
         do { \
-        if(infolvl<lvl) fprintf(stdout, _(format), ## a); \
+        if(infolvl>=lvl) fprintf(stdout, _(format), ## a); \
         } while(0)
 #define XMERR(format) \
         fprintf(stdout, _(format))

diff --git a/dasdutil.c b/dasdutil.c
@@ -485,7 +485,7 @@ int             extsize;                /* Extent size in tracks     */
         end = (ecyl * heads) + etrk;
         extsize = end - start + 1;
 
-        if (trk <= extsize)
+        if (trk < extsize)
         {
             trk += start;
             *cyl = trk / heads;

diff --git a/esame.c b/esame.c
@@ -1011,7 +1011,7 @@ U64     n;
 DEF_INST(subtract_logical_borrow_long_register)
 {
 int     r1, r2;                         /* Values of R fields        */
-int     borrow = 0;
+int     borrow = 2;
 U64     n;
 
     RRE(inst, execflag, regs, r1, r2);
@@ -1022,12 +1022,12 @@ U64     n;
     if(!(regs->psw.cc & 2))
         borrow = sub_logical_long(&(regs->GR_G(r1)),
                                     regs->GR_G(r1),
-                                    1) & 2;
+                                    1);
 
     /* Subtract unsigned operands and set condition code */
     regs->psw.cc = sub_logical_long(&(regs->GR_G(r1)),
                                       regs->GR_G(r1),
-                                      n) & ~borrow;
+                                      n) & (borrow|1);
 
 } /* end DEF_INST(subtract_logical_borrow_long_register) */
 #endif /*defined(FEATURE_ESAME)*/
@@ -1074,7 +1074,7 @@ int     r1;                             /* Values of R fields        */
 int     b2;                             /* Base of effective addr    */
 VADR    effective_addr2;                /* Effective address         */
 U64     n;                              /* 64-bit operand values     */
-int     borrow = 0;
+int     borrow = 2;
 
     RXE(inst, execflag, regs, r1, b2, effective_addr2);
 
@@ -1085,12 +1085,12 @@ int     borrow = 0;
     if(!(regs->psw.cc & 2))
         borrow = sub_logical_long(&(regs->GR_G(r1)),
                                     regs->GR_G(r1),
-                                    1) & 2;
+                                    1);
 
     /* Subtract unsigned operands and set condition code */
     regs->psw.cc = sub_logical_long(&(regs->GR_G(r1)),
                                       regs->GR_G(r1),
-                                      n) & ~borrow;
+                                      n) & (borrow|1);
 
 } /* end DEF_INST(subtract_logical_borrow_long) */
 #endif /*defined(FEATURE_ESAME)*/
@@ -1131,7 +1131,7 @@ U32     n;
 DEF_INST(subtract_logical_borrow_register)
 {
 int     r1, r2;                         /* Values of R fields        */
-int     borrow = 0;
+int     borrow = 2;
 U32     n;
 
     RRE(inst, execflag, regs, r1, r2);
@@ -1142,12 +1142,12 @@ U32     n;
     if(!(regs->psw.cc & 2))
         borrow = sub_logical(&(regs->GR_L(r1)),
                                regs->GR_L(r1),
-                               1) & 2;
+                               1);
 
     /* Subtract unsigned operands and set condition code */
     regs->psw.cc = sub_logical(&(regs->GR_L(r1)),
                                  regs->GR_L(r1),
-                                 n) & ~borrow;
+                                 n) & (borrow|1);
 
 } /* end DEF_INST(subtract_logical_borrow_register) */
 #endif /*defined(FEATURE_ESAME_N3_ESA390) || defined(FEATURE_ESAME)*/
@@ -1194,7 +1194,7 @@ int     r1;                             /* Values of R fields        */
 int     b2;                             /* Base of effective addr    */
 VADR    effective_addr2;                /* Effective address         */
 U32     n;                              /* 32-bit operand values     */
-int     borrow = 0;
+int     borrow = 2;
 
     RXE(inst, execflag, regs, r1, b2, effective_addr2);
 
@@ -1205,12 +1205,12 @@ int     borrow = 0;
     if(!(regs->psw.cc & 2))
         borrow = sub_logical(&(regs->GR_L(r1)),
                                regs->GR_L(r1),
-                               1) & 2;
+                               1);
 
     /* Subtract unsigned operands and set condition code */
     regs->psw.cc = sub_logical(&(regs->GR_L(r1)),
                                  regs->GR_L(r1),
-                                 n) & ~borrow;
+                                 n) & (borrow|1);
 
 } /* end DEF_INST(subtract_logical_borrow) */
 #endif /*defined(FEATURE_ESAME_N3_ESA390) || defined(FEATURE_ESAME)*/

diff --git a/html/hercinst.html b/html/hercinst.html
@@ -16,7 +16,7 @@ <h3>Building from source</h3>
 href="http://www.bsp-gmbh.com/hercules/nude_w32.html">http://www.bsp-gmbh.com/hercules/nude_w32.html</a>.
 <ol>
 <li>Download the distribution file
-<a href="hercules-2.17.tar.gz">hercules-2.17.tar.gz</a>
+<a href="hercules-2.17.1.tar.gz">hercules-2.17.1.tar.gz</a>
 <p>
 <em>Notes:</em>
 <ol>
@@ -29,8 +29,8 @@ <h3>Building from source</h3>
 </ol>
 <p>
 <li>Use these commands to unzip the distribution file:
-<pre>tar xvzf ../hercules-2.17.tar.gz
-cd hercules-2.17</pre>
+<pre>tar xvzf ../hercules-2.17.1.tar.gz
+cd hercules-2.17.1</pre>
 <li>Configure Hercules for your system:
 
 <p><code>./configure</code>
@@ -60,7 +60,7 @@ <h3>Installing prebuilt RPMs:</h3>
 <ol>
 <li>Download the RPM file you want:
 <ul>
-<li><a href="hercules-2.17-1.i386.rpm">hercules-2.17-1.i386.rpm</a>: Intel
+<li><a href="hercules-2.17.1-1.i386.rpm">hercules-2.17.1-1.i386.rpm</a>: Intel
 </ul>
 <li>Install the RPM:
 <br><code>rpm -Uvh</code> <i>RPMfile</i>
@@ -89,7 +89,7 @@ <h3>Installing on Mac OS X:</h3>
 
 <ol>
 <li>Download the compressed disk image: <a
-href="hercules-2.17.dmg">hercules-2.17.dmg</a>
+href="hercules-2.17.1.dmg">hercules-2.17.1.dmg</a>
 <li>Mount the image by double-clicking on it in the Finder.
 Your web browser may have done that for you already.
 <li>Installation and use instructions are in the
@@ -307,6 +307,6 @@ <h2>Technical Support</h2>
 </center>
 
 <small>
-<p>Last updated 1 February 2003
+<p>Last updated 12 February 2003
 </BODY>
 </HTML>
diff --git a/html/hercnew.html b/html/hercnew.html
@@ -8,6 +8,18 @@
       VLINK="#008040" ALINK="#000000">
 <h1>What's new in Hercules</h1>
 <hr noshade>
+<h2>What's new in release 2.17.1</h2>
+<p>Release date: 12 February 2003
+<ul>
+<li>Corrected RPM installed files permissions (John Summerfield)
+<li>Corrected dasdload verbosity level (Jay Maynard)
+<li>Corrected card reader eof/intrq option handling, added * to designate
+no file loaded (Jay Maynard)
+<li>Correct SLB instruction condition code (Jan Jaeger)
+<li>Fix dasdutil.c track conversion function (Jim Morrison)
+</ul>
+<p>Download
+<a href="hercules-2.17.1.tar.gz">hercules-2.17.1.tar.gz</a>
 <h2>What's new in release 2.17</h2>
 <p>Release date: 1 February 2003
 <ul>
@@ -781,6 +793,6 @@ <h2>What's new in release 1.32</h2>
 </center>
 
 <small>
-<p>Last updated 1 February 2003
+<p>Last updated 12 February 2003
 </BODY>
 </HTML>
diff --git a/html/index.html b/html/index.html
@@ -30,25 +30,25 @@ <h1>The Hercules System/370, ESA/390, and z/Architecture Emulator</h1>
 Open Source Software.<br><img src="images/osi-certified-60x50.jpg"></a>
 </ul>
 <p>
-Download the current release version, 2.17:
+Download the current release version, 2.17.1:
 <ul>
-<li><a href="hercules-2.17.tar.gz">hercules-2.17.tar.gz</a>: Source tarball
-<li><a href="hercules-2.17-1.i386.rpm">hercules-2.17-1.i386.rpm</a>: Intel RPM
-<li><a href="hercules-2.17-1.src.rpm">hercules-2.17-1.src.rpm</a>: Source
+<li><a href="hercules-2.17.1tar.gz">hercules-2.17.1.tar.gz</a>: Source tarball
+<li><a href="hercules-2.17.1-1.i386.rpm">hercules-2.17.1-1.i386.rpm</a>: Intel RPM
+<li><a href="hercules-2.17.1-1.src.rpm">hercules-2.17.1-1.src.rpm</a>: Source
 RPM (if you want to build RPMs yourself)
-<li><a href="hercules217-i586f.exe">hercules217-i586f.exe</a>:
+<li><a href="hercules2171-i586f.exe">hercules2171-i586f.exe</a>:
 Self-extracting archive for Windows, Pentium, Fish (optimized) threads
 version
-<li><a href="hercules217-i686f.exe">hercules217-i686f.exe</a>:
+<li><a href="hercules2171-i686f.exe">hercules2171-i686f.exe</a>:
 Self-extracting archive for Windows, Pentium Pro/Pentium II and above,
 Fish (optimized) threads version
-<li><a href="hercules217-i586p.exe">hercules217-i586p.exe</a>:
+<li><a href="hercules2171-i586p.exe">hercules2171-i586p.exe</a>:
 Self-extracting archive for Windows, Pentium, standard pthreads
 version
-<li><a href="hercules217-i686p.exe">hercules217-i686p.exe</a>:
+<li><a href="hercules2171-i686p.exe">hercules2171-i686p.exe</a>:
 Self-extracting archive for Windows, Pentium Pro/Pentium II and above,
 standard pthreads version
-<li><a href="hercules-2.17.dmg.gz">hercules-2.17.dmg</a>: Mac OS X
+<li><a href="hercules-2.17.1.dmg">hercules-2.17.1.dmg</a>: Mac OS X
 version, compressed disk image
 </ul>
 
@@ -95,15 +95,6 @@ <h3>
 </h3>
 <p>
 <em>&#147;
-Never in my wildest dreams did I expect to see MVS
-running on a machine that I personally own.
-Hercules is a marvelous tool.  My thanks to you all for a job
-very well done.
-&#148;</em>
-<br>&#151;
-Reed H. Petty
-<p>
-<em>&#147;
 I do miss my mainframe a lot, and playing with Herc sure brings back
 memories.  Just seeing the IBM message prefixes, and responding to
 console messages again was a wonderful bit of nostalgia!
@@ -237,6 +228,6 @@ <h3>
 registered trademarks of IBM Corporation.
 Other product names mentioned here are trademarks of other companies.
 <small>
-<p>Last updated 1 February 2003
+<p>Last updated 12 February 2003
 </BODY>
 </HTML>
diff --git a/po/de.gmo b/po/de.gmo
diff --git a/po/de.po b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hercules 2.16\n"
-"POT-Creation-Date: 2003-02-01 16:10-0600\n"
+"POT-Creation-Date: 2003-02-12 22:25-0600\n"
 "PO-Revision-Date: 2002-05-10 16:16+0200\n"
 "Last-Translator: Jan Jaeger <jj@septa.nl>\n"
 "Language-Team: none <test@li.org>\n"
@@ -78,52 +78,52 @@ msgstr "HHC403I 'multifile' optie niet gebruikt\n"
 msgid "HHCRD009E File name too long (max=%ud): \"%s\"\n"
 msgstr "HHC401I Bestandsnaam \"%2$s\" te lang (maximum=%1$ud)\n"
 
-#: cardrdr.c:240
+#: cardrdr.c:245
 #, fuzzy, c-format
 msgid "HHCRD010E Unable to access file \"%s\": %s\n"
 msgstr "HHC402I Fout %2$s bij benaderen bestand \"%1$s\"\n"
 
-#: cardrdr.c:315
+#: cardrdr.c:320
 #, fuzzy, c-format
 msgid "HHCRD011E Close error on file \"%s\": %s\n"
 msgstr "HHC419E Fout %2$s bij sluiten van bestand \"%1$s\"\n"
 
-#: cardrdr.c:324
+#: cardrdr.c:329
 #, fuzzy, c-format
 msgid "HHCRD012I %s (%s) disconnected from device %4.4X (%s)\n"
 msgstr "HHC420I %s (%s) afgesloten van apparaat %4.4X (%s)\n"
 
-#: cardrdr.c:453
+#: cardrdr.c:458
 #, fuzzy, c-format
 msgid "HHCRD013E Error opening file %s: %s\n"
 msgstr "HHC423I Fout %2$s bij openen bestand \"%1$s\"\n"
 
-#: cardrdr.c:477
+#: cardrdr.c:482
 #, fuzzy, c-format
 msgid "HHCRD014E Error reading file %s: %s\n"
 msgstr "HHC409I Fout %2$s bij lezen van bestand \"%1$s\"\n"
 
-#: cardrdr.c:510
+#: cardrdr.c:515
 #, fuzzy, c-format
 msgid "HHCRD015E Seek error in file %s: %s\n"
 msgstr "HHC406I Fout %2$s bij zoeken in bestand \"%1$s\"\n"
 
-#: cardrdr.c:577
+#: cardrdr.c:582
 #, fuzzy, c-format
 msgid "HHCRD016E Error reading file %s: %s\n"
 msgstr "HHC409I Fout %2$s bij lezen van bestand \"%1$s\"\n"
 
-#: cardrdr.c:580
+#: cardrdr.c:585
 #, fuzzy, c-format
 msgid "HHCRD017E Unexpected end of file on %s\n"
 msgstr "HHC40I Onverwacht einde van bestand \"%s\"\n"
 
-#: cardrdr.c:644
+#: cardrdr.c:649
 #, fuzzy, c-format
 msgid "HHCRD018E Error reading file %s: %s\n"
 msgstr "HHC409I Fout %2$s bij lezen van bestand \"%1$s\"\n"
 
-#: cardrdr.c:672
+#: cardrdr.c:677
 #, fuzzy, c-format
 msgid "HHCRD019E Card image exceeds %d bytes in file %s\n"
 msgstr "HHC410I Ponskaart %d bytes te groot in bestand \"%s\"\n"