Patch #:	20
Type:		bug fix
Priority:	low
Affects:	aufs quotas on Encore MultiMax
Reported:	David Hornsby <djh@munnari.OZ.AU>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch020
Summary:	UMAX provides both quotactl and quota, hide latter
File:		cap60/applications/afpos.c
File:		cap60/Configure

*** applications/aufs/afpos.c.orig	Mon May 20 22:52:07 1991
--- applications/aufs/afpos.c		Mon May 20 22:54:32 1991
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1991/05/07 10:49:34 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.4 1991/05/07 10:49:34 djh Exp djh $
!  * $Revision: 2.4 $
   */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1991/05/20 12:54:11 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.5 1991/05/20 12:54:11 djh Exp djh $
!  * $Revision: 2.5 $
   */
  
  /*
***************
*** 2073,2079 ****
--- 2073,2083 ----
  #ifdef gould
    if (gquota(Q_GETDLIM, usruid, buf.st_dev, &dqblk) == 0 &&
  #else  gould
+ #ifdef encore
+   if (equota(Q_GETDLIM, usruid, buf.st_dev, &dqblk) == 0 &&
+ #else  encore
    if (quota(Q_GETDLIM, usruid, buf.st_dev, &dqblk) == 0 &&
+ #endif encore
  #endif gould
        dqblk.dqb_bhardlimit != 0) { /* make sure not unlimited */
      v->v_size = dqblk.dqb_bhardlimit*512;
***************
*** 2378,2384 ****
--- 2382,2392 ----
  #ifdef gould
  gquota(cmd, uid, arg, addr)
  #else  gould
+ #ifdef encore
+ equota(cmd, uid, arg, addr)
+ #else  encore
  quota(cmd, uid, arg, addr)
+ #endif encore
  #endif gould
  int cmd, uid, arg;
  caddr_t addr;
*** Configure.orig	Mon May 20 22:56:20 1991
--- Configure		Mon May 20 22:58:31 1991
***************
*** 944,950 ****
  define([cflags],concat(cflags,ifdef([usebyteswap],[ -DBYTESWAPPED],[])))
  define([bigcflags],ifelse(os,[hpux],[+Nd2000 +Ns2000]))
  # The encore optimiser is slightly over zealous
! ifelse(os,[encore],[],[
      define([cflags],concat(cflags,[ -O]))])
  ifelse(os,[pyr],[
      define([cflags],concat(cflags,[ -q]))])
--- 944,950 ----
  define([cflags],concat(cflags,ifdef([usebyteswap],[ -DBYTESWAPPED],[])))
  define([bigcflags],ifelse(os,[hpux],[+Nd2000 +Ns2000]))
  # The encore optimiser is slightly over zealous
! ifelse(os,[encore],[define([cflags],concat(cflags,[ -Dencore]))],[
      define([cflags],concat(cflags,[ -O]))])
  ifelse(os,[pyr],[
      define([cflags],concat(cflags,[ -q]))])
*** README.orig		Mon May 20 23:00:10 1991
--- README		Mon May 20 23:00:23 1991
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 19, May 1991
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 20, May 1991
  
  Introduction
  ------------