*** ./Makefile.in	Tue Jun 30 10:41:53 1998
--- ../mtools-3.9.1pl2906/./Makefile.in	Tue Jun 30 11:04:30 1998
***************
*** 117,123 ****
--- 117,125 ----
  CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) 
  CXXFLAGS  = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) 
  LINK      = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ CXXLINK   = $(CXX) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
  ALLLIBS   = $(USERLDLIBS) $(MACHDEPLIBS) $(LIBS) $(SHLIB)
+ XLIBS     = -L/usr/X11R6/lib -lX11
  
  all:    mtools $(LINKS) mkmanifest @FLOPPYD@
  
***************
*** 134,140 ****
  	$(LINK) $(OBJS2) -o $@ $(ALLLIBS)
  
  floppyd: $(OBJS3)
! 	$(LINK) $(OBJS3) -o $@ -L/usr/X11R6/lib -lX11
  
  $(LINKS): mtools
  	rm -f $@ && $(LN_S) mtools $@
--- 136,142 ----
  	$(LINK) $(OBJS2) -o $@ $(ALLLIBS)
  
  floppyd: $(OBJS3)
! 	$(CXXLINK) $(OBJS3) -o $@ $(XLIBS)
  
  $(LINKS): mtools
  	rm -f $@ && $(LN_S) mtools $@
*** ./mtools.texi	Tue Jun 30 10:41:57 1998
--- ../mtools-3.9.1pl2906/./mtools.texi	Tue Jun 30 10:53:39 1998
***************
*** 26,32 ****
  @ifinfo
  @format
  START-INFO-DIR-ENTRY
! * Mtools: (mtools).        Mtools: utilities to access DOS disks in Unix.
  END-INFO-DIR-ENTRY
  @end format
  @end ifinfo
--- 26,32 ----
  @ifinfo
  @format
  START-INFO-DIR-ENTRY
! * Mtools: (mtools).         Mtools: utilities to access DOS disks in Unix.
  END-INFO-DIR-ENTRY
  @end format
  @end ifinfo
***************
*** 597,603 ****
  
   This sections explains the syntax of the configurations files for
  mtools. The configuration files are called
! @file{/usr/local/etc/mtools.conf} and @file{~/.mtoolsrc}. If the
  environmental variable @code{MTOOLSRC} is set, its contents is used as
  the filename for a third configuration file. These configuration files
  describe the following items:
--- 597,603 ----
  
   This sections explains the syntax of the configurations files for
  mtools. The configuration files are called
! @file{/usr/freeware/etc/mtools.conf} and @file{~/.mtoolsrc}. If the
  environmental variable @code{MTOOLSRC} is set, its contents is used as
  the filename for a third configuration file. These configuration files
  describe the following items:
***************
*** 627,633 ****
  @cindex Name of configuration files
  @cindex Location of configuration files
  
! @file{/usr/local/etc/mtools.conf} is the system-wide configuration file,
  and @file{~/.mtoolsrc} is the user's private configuration file.
  
  On some systems, the system-wide configuration file is called
--- 627,633 ----
  @cindex Name of configuration files
  @cindex Location of configuration files
  
! @file{/usr/freeware/etc/mtools.conf} is the system-wide configuration file,
  and @file{~/.mtoolsrc} is the user's private configuration file.
  
  On some systems, the system-wide configuration file is called
***************
*** 1020,1026 ****
  Mtools uses its root privileges to open the device, and to issue the
  actual SCSI I/O calls.  Moreover, root privileges are only used for
  drives described in a system-wide configuration file such as
! @file{/usr/local/etc/mtools.conf}, and not for those described in
  @file{~/.mtoolsrc} or @file{$MTOOLSRC}.  
  
  @item privileged
--- 1020,1026 ----
  Mtools uses its root privileges to open the device, and to issue the
  actual SCSI I/O calls.  Moreover, root privileges are only used for
  drives described in a system-wide configuration file such as
! @file{/usr/freeware/etc/mtools.conf}, and not for those described in
  @file{~/.mtoolsrc} or @file{$MTOOLSRC}.  
  
  @item privileged
***************
*** 1029,1035 ****
  When set to 1, this instructs mtools to use its set-uid and set-gid
  privileges for opening the given drive.  This option is only valid for
  drives described in the system-wide configuration files (such as
! @file{/usr/local/etc/mtools.conf}, not @file{~/.mtoolsrc} or
  @file{$MTOOLSRC}).  Obviously, this option is also a no op if mtools is
  not installed setuid or setgid.  This option is implied by 'scsi=1', but
  again only for drives defined in system-wide configuration files.
--- 1029,1035 ----
  When set to 1, this instructs mtools to use its set-uid and set-gid
  privileges for opening the given drive.  This option is only valid for
  drives described in the system-wide configuration files (such as
! @file{/usr/freeware/etc/mtools.conf}, not @file{~/.mtoolsrc} or
  @file{$MTOOLSRC}).  Obviously, this option is also a no op if mtools is
  not installed setuid or setgid.  This option is implied by 'scsi=1', but
  again only for drives defined in system-wide configuration files.
***************
*** 1304,1310 ****
  @item
  compiled-in defaults
  @item
! @file{/usr/local/etc/mtools.conf}
  @item
  @file{/etc/mtools}
  This is for backwards compatibility only, and is only parsed if
--- 1304,1310 ----
  @item
  compiled-in defaults
  @item
! @file{/usr/freeware/etc/mtools.conf}
  @item
  @file{/etc/mtools}
  This is for backwards compatibility only, and is only parsed if
***************
*** 1320,1329 ****
  Options described in the later files override those described in the
  earlier files. Drives defined in earlier files persist if they are not
  overridden in the later files. For instance, drives A and B may be
! defined in @file{/usr/local/etc/mtools.conf} and drives C and D may be
  defined in @file{~/.mtoolsrc} However, if @file{~/.mtoolsrc} also
  defines drive A, this new description would override the description of
! drive A in @file{/usr/local/etc/mtools.conf} instead of adding to it. If
  you want to add a new description to a drive already described in an
  earlier file, you need to use either the @code{+drive} or @code{drive+}
  keyword.
--- 1320,1329 ----
  Options described in the later files override those described in the
  earlier files. Drives defined in earlier files persist if they are not
  overridden in the later files. For instance, drives A and B may be
! defined in @file{/usr/freeware/etc/mtools.conf} and drives C and D may be
  defined in @file{~/.mtoolsrc} However, if @file{~/.mtoolsrc} also
  defines drive A, this new description would override the description of
! drive A in @file{/usr/freeware/etc/mtools.conf} instead of adding to it. If
  you want to add a new description to a drive already described in an
  earlier file, you need to use either the @code{+drive} or @code{drive+}
  keyword.
***************
*** 2526,2532 ****
  same devices are found on a large number of hosts of this type. In that
  case, could you also let me know about your new definitions, so that I
  can include them into the next release.  For purely local file, I
! recommend that you use the @code{/usr/local/etc/mtools.conf} and
  @code{~/.mtoolsrc} configuration files.
  
   However, the devices files also allows to supply geometry setting
--- 2526,2532 ----
  same devices are found on a large number of hosts of this type. In that
  case, could you also let me know about your new definitions, so that I
  can include them into the next release.  For purely local file, I
! recommend that you use the @code{/usr/freeware/etc/mtools.conf} and
  @code{~/.mtoolsrc} configuration files.
  
   However, the devices files also allows to supply geometry setting
*** ./mtools.1	Tue Jun 30 10:41:56 1998
--- ../mtools-3.9.1pl2906/./mtools.1	Tue Jun 30 10:54:02 1998
***************
*** 502,508 ****
  .PP
   This sections explains the syntax of the configurations files for
  mtools. The configuration files are called
! \&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If the
  environmental variable \fR\&\f(CWMTOOLSRC\fR is set, its contents is used as
  the filename for a third configuration file. These configuration files
  describe the following items:
--- 502,508 ----
  .PP
   This sections explains the syntax of the configurations files for
  mtools. The configuration files are called
! \&\fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If the
  environmental variable \fR\&\f(CWMTOOLSRC\fR is set, its contents is used as
  the filename for a third configuration file. These configuration files
  describe the following items:
***************
*** 519,525 ****
  .iX "c Name of configuration files"
  .iX "c Location of configuration files"
  .PP
! \&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR is the system-wide configuration file,
  and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR is the user's private configuration file.
  .PP
  On some systems, the system-wide configuration file is called
--- 519,525 ----
  .iX "c Name of configuration files"
  .iX "c Location of configuration files"
  .PP
! \&\fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR is the system-wide configuration file,
  and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR is the user's private configuration file.
  .PP
  On some systems, the system-wide configuration file is called
***************
*** 922,928 ****
  Mtools uses its root privileges to open the device, and to issue the
  actual SCSI I/O calls.  Moreover, root privileges are only used for
  drives described in a system-wide configuration file such as
! \&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, and not for those described in
  \&\fR\&\f(CW\(if~/.mtoolsrc\(is\fR or \fR\&\f(CW\(if$MTOOLSRC\(is\fR.  
  .TP
  \&\fR\&\f(CWprivileged\fR\ 
--- 922,928 ----
  Mtools uses its root privileges to open the device, and to issue the
  actual SCSI I/O calls.  Moreover, root privileges are only used for
  drives described in a system-wide configuration file such as
! \&\fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR, and not for those described in
  \&\fR\&\f(CW\(if~/.mtoolsrc\(is\fR or \fR\&\f(CW\(if$MTOOLSRC\(is\fR.  
  .TP
  \&\fR\&\f(CWprivileged\fR\ 
***************
*** 931,937 ****
  When set to 1, this instructs mtools to use its set-uid and set-gid
  privileges for opening the given drive.  This option is only valid for
  drives described in the system-wide configuration files (such as
! \&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or
  \&\fR\&\f(CW\(if$MTOOLSRC\(is\fR).  Obviously, this option is also a no op if mtools is
  not installed setuid or setgid.  This option is implied by 'scsi=1', but
  again only for drives defined in system-wide configuration files.
--- 931,937 ----
  When set to 1, this instructs mtools to use its set-uid and set-gid
  privileges for opening the given drive.  This option is only valid for
  drives described in the system-wide configuration files (such as
! \&\fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or
  \&\fR\&\f(CW\(if$MTOOLSRC\(is\fR).  Obviously, this option is also a no op if mtools is
  not installed setuid or setgid.  This option is implied by 'scsi=1', but
  again only for drives defined in system-wide configuration files.
***************
*** 1216,1222 ****
  compiled-in defaults
  .TP
  2.\ 
! \&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR
  .TP
  3.\ 
  \&\fR\&\f(CW\(if/etc/mtools\(is\fR
--- 1216,1222 ----
  compiled-in defaults
  .TP
  2.\ 
! \&\fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR
  .TP
  3.\ 
  \&\fR\&\f(CW\(if/etc/mtools\(is\fR
***************
*** 1234,1243 ****
  Options described in the later files override those described in the
  earlier files. Drives defined in earlier files persist if they are not
  overridden in the later files. For instance, drives A and B may be
! defined in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and drives C and D may be
  defined in \fR\&\f(CW\(if~/.mtoolsrc\(is\fR However, if \fR\&\f(CW\(if~/.mtoolsrc\(is\fR also
  defines drive A, this new description would override the description of
! drive A in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR instead of adding to it. If
  you want to add a new description to a drive already described in an
  earlier file, you need to use either the \fR\&\f(CW+drive\fR or \fR\&\f(CWdrive+\fR
  keyword.
--- 1234,1243 ----
  Options described in the later files override those described in the
  earlier files. Drives defined in earlier files persist if they are not
  overridden in the later files. For instance, drives A and B may be
! defined in \fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR and drives C and D may be
  defined in \fR\&\f(CW\(if~/.mtoolsrc\(is\fR However, if \fR\&\f(CW\(if~/.mtoolsrc\(is\fR also
  defines drive A, this new description would override the description of
! drive A in \fR\&\f(CW\(if/usr/freeware/etc/mtools.conf\(is\fR instead of adding to it. If
  you want to add a new description to a drive already described in an
  earlier file, you need to use either the \fR\&\f(CW+drive\fR or \fR\&\f(CWdrive+\fR
  keyword.
***************
*** 2542,2548 ****
  same devices are found on a large number of hosts of this type. In that
  case, could you also let me know about your new definitions, so that I
  can include them into the next release.  For purely local file, I
! recommend that you use the \fR\&\f(CW/usr/local/etc/mtools.conf\fR and
  \&\fR\&\f(CW~/.mtoolsrc\fR configuration files.
  .PP
   However, the devices files also allows to supply geometry setting
--- 2542,2548 ----
  same devices are found on a large number of hosts of this type. In that
  case, could you also let me know about your new definitions, so that I
  can include them into the next release.  For purely local file, I
! recommend that you use the \fR\&\f(CW/usr/freeware/etc/mtools.conf\fR and
  \&\fR\&\f(CW~/.mtoolsrc\fR configuration files.
  .PP
   However, the devices files also allows to supply geometry setting