* fhandler_tape.cc (fhandler_dev_tape::tape_status): Report

        EOTWarningZoneSize in get->mt_eotwarningzonesize.
        * include/cygwin/mtio.h: Define DEFTAPE.
        (struct mtget): Add member `mt_eotwarningzonesize'. Add a comment.
        * include/cygwin/version.h: Bump API minor version to 47.

diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 35ff999..1963137 100644 (file)
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -795,6 +795,7 @@ fhandler_dev_tape::tape_status (struct mtget *get)
   get->mt_defblksize = dp.DefaultBlockSize;
   get->mt_featureslow = dp.FeaturesLow;
   get->mt_featureshigh = dp.FeaturesHigh;
+  get->mt_eotwarningzonesize = dp.EOTWarningZoneSize;
 
   return 0;
 }

diff --git a/winsup/cygwin/include/cygwin/mtio.h b/winsup/cygwin/include/cygwin/mtio.h
index 213fc7d..04e6523 100644 (file)
--- a/winsup/cygwin/include/cygwin/mtio.h
+++ b/winsup/cygwin/include/cygwin/mtio.h
@@ -20,6 +20,10 @@ details. */
 #include <sys/ioctl.h>
 #include <asm/socket.h>
 
+#ifndef DEFTAPE
+#define DEFTAPE "/dev/tape"
+#endif
+
 /*
  * Structures and definitions for mag tape io control commands
  */
@@ -85,7 +89,8 @@ struct        mtget {
                                 *  Cygwin: remaining KB.
                                 */
        /* the following registers are device dependent */
-       long    mt_dsreg;       /* status register */
+       long    mt_dsreg;       /* status register, Cygwin returns current
+                                  blocksize here. */
        long    mt_gstat;       /* generic (device independent) status */
        long    mt_erreg;       /* error register */
        /* The next two fields are not always used */
@@ -99,6 +104,7 @@ struct       mtget {
        int             mt_defblksize;
        unsigned long   mt_featureslow;
        unsigned long   mt_featureshigh;
+       unsigned long   mt_eotwarningzonesize;
 };
 
 /* structure for MTIOCPOS - mag tape get position command */

diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 65adf7c..77cf667 100644 (file)
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -144,10 +144,11 @@ details. */
        44: Export dirfd
        45: perprocess change, gamma_r, gammaf_r, lgamma_r, lgammaf_r
        46: Remove cygwin_getshared
+       47: Report EOTWarningZoneSize in struct mtget.
      */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 46
+#define CYGWIN_VERSION_API_MINOR 47
 
      /* There is also a compatibity version number associated with the
        shared memory regions.  It is incremented when incompatible