Patch #:	188
Type:		bug fix
Priority:	medium
Affects:	sites running AUFS on Alpha OSF/1
Reported:	Scooter Morris <scooter@gene.com>
Reported:	Ulf Kronman <ulf@argo.kib.ki.se>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch188
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch188'
Summary:	volume size reported incorrectly, use f_fsize field
File:		cap60/applications/aufs/afpos.c

*** applications/aufs/afpos.c.orig	Mon Jan 31 09:26:30 1994
--- applications/aufs/afpos.c		Tue Feb  1 15:52:10 1994
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1994/01/30 22:26:14 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.48 1994/01/30 22:26:14 djh Rel djh $
!  * $Revision: 2.48 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1994/02/01 04:51:41 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.49 1994/02/01 04:51:41 djh Rel djh $
!  * $Revision: 2.49 $
   *
   */
  
***************
*** 2432,2438 ****
    }
  # else  /* sgi || apollo */
    if (statfs(path, &fsbuf) >= 0) {
! #ifdef __386BSD__
      /*
       * on 386/BSD, the block size is in f_fsize
       * and f_bsize is the optimum transfer size
--- 2432,2438 ----
    }
  # else  /* sgi || apollo */
    if (statfs(path, &fsbuf) >= 0) {
! #if defined(__386BSD__) || defined(__osf__)
      /*
       * on 386/BSD, the block size is in f_fsize
       * and f_bsize is the optimum transfer size
***************
*** 2441,2451 ****
      v->v_size = fsbuf.f_fsize * fsbuf.f_blocks;
      /* limiting factor: cannot report on overutilization of a volume */
      v->v_free = (fsbuf.f_bavail < 0) ? 0 : fsbuf.f_fsize * fsbuf.f_bavail;
! #else  /* __386BSD__ */
      v->v_size = fsbuf.f_bsize * fsbuf.f_blocks;
      /* limiting factor: cannot report on overutilization of a volume */
      v->v_free = (fsbuf.f_bavail < 0) ? 0 : fsbuf.f_bsize * fsbuf.f_bavail;
! #endif /* __386BSD__ */
      return(noErr);
    }
  # endif /* sgi || apollo */
--- 2441,2451 ----
      v->v_size = fsbuf.f_fsize * fsbuf.f_blocks;
      /* limiting factor: cannot report on overutilization of a volume */
      v->v_free = (fsbuf.f_bavail < 0) ? 0 : fsbuf.f_fsize * fsbuf.f_bavail;
! #else  /* __386BSD__ || __osf__ */
      v->v_size = fsbuf.f_bsize * fsbuf.f_blocks;
      /* limiting factor: cannot report on overutilization of a volume */
      v->v_free = (fsbuf.f_bavail < 0) ? 0 : fsbuf.f_bsize * fsbuf.f_bavail;
! #endif /* __386BSD__ || __osf__ */
      return(noErr);
    }
  # endif /* sgi || apollo */
*** lib/cap/abversion.c.orig	Tue Feb  1 10:52:43 1994
--- lib/cap/abversion.c		Tue Feb  1 15:53:27 1994
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1994/01/31 23:52:37 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.87 1994/01/31 23:52:37 djh Rel djh $
!  * $Revision: 2.87 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1994/02/01 04:53:21 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.88 1994/02/01 04:53:21 djh Rel djh $
!  * $Revision: 2.88 $
   *
   */
  
***************
*** 32,38 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 187;
    myversion.cv_rmonth = "February";
    myversion.cv_ryear = "1994";
    switch (lap_proto) {
--- 32,38 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 188;
    myversion.cv_rmonth = "February";
    myversion.cv_ryear = "1994";
    switch (lap_proto) {
*** README.orig		Tue Feb  1 10:54:15 1994
--- README		Tue Feb  1 15:54:09 1994
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 187, February 1994
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 188, February 1994
  
  Notice
  ------