Patch #:	104
Type:		bug fix
Priority:	low
Affects:	sites compiling lwsrv under AIX 3.1.5
Reported:	Himanshu Oberoi <hoberoi@limerick.cbs.umn.edu>
Reported:	Jan Dj{rv <jhd@irfu.se>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch104
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch104'
Summary:	Fix <usr/dirent.h> and mode test under AIX
File:		cap60/applications/lwsrv/procset.c

*** applications/lwsrv/procset.c.orig	Mon Nov 18 00:44:50 1991
--- applications/lwsrv/procset.c	Mon Jun 29 22:04:01 1992
***************
*** 1,6 ****
! static char rcsid[] = "$Author: djh $ $Date: 1991/11/17 13:44:43 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/procset.c,v 2.5 1991/11/17 13:44:43 djh Rel djh $";
! static char revision[] = "$Revision: 2.5 $";
  
  /*
   * procset - UNIX AppleTalk spooling program: act as a laserwriter
--- 1,6 ----
! static char rcsid[] = "$Author: djh $ $Date: 1992/06/29 12:03:45 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/procset.c,v 2.6 1992/06/29 12:03:45 djh Rel djh $";
! static char revision[] = "$Revision: 2.6 $";
  
  /*
   * procset - UNIX AppleTalk spooling program: act as a laserwriter
***************
*** 41,47 ****
  # include <strings.h>
  #endif USESTRINGDOTH
  #ifdef USEDIRENT
! # include <sys/dirent.h>
  #endif USEDIRENT
  #ifdef xenix5
  # include <unistd.h>
--- 41,47 ----
  # include <strings.h>
  #endif USESTRINGDOTH
  #ifdef USEDIRENT
! # include <dirent.h>
  #endif USEDIRENT
  #ifdef xenix5
  # include <unistd.h>
***************
*** 94,105 ****
    if (stat(fn, &stb) < 0)
      return(FALSE);
  #ifdef USEDIRENT
    /* sysv follows xpg standards */
!   if (S_ISREG(&stb) == 0)		/* make sure regular file */
  #else  USEDIRENT
    if (S_ISREG(stb.st_mode) == 0)		/* make sure regular file */
- #endif USEDIRENT
      return(FALSE);
    if (access(fn, R_OK) < 0)
      return(FALSE);
    return(TRUE);
--- 94,111 ----
    if (stat(fn, &stb) < 0)
      return(FALSE);
  #ifdef USEDIRENT
+ #ifdef AIX
+   if (S_ISREG(stb.st_mode) == 0)		/* make sure regular file */
+     return(FALSE);
+ #else  AIX
    /* sysv follows xpg standards */
!   if (S_ISREG(&stb) == 0)			/* make sure regular file */
!     return(FALSE);
! #endif AIX
  #else  USEDIRENT
    if (S_ISREG(stb.st_mode) == 0)		/* make sure regular file */
      return(FALSE);
+ #endif USEDIRENT
    if (access(fn, R_OK) < 0)
      return(FALSE);
    return(TRUE);
*** lib/cap/abversion.c.orig	Wed Jun 24 10:53:59 1992
--- lib/cap/abversion.c		Mon Jun 29 22:06:42 1992
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1992/06/24 00:53:24 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.3 1992/06/24 00:53:24 djh Rel djh $
!  * $Revision: 2.3 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1992/06/29 12:06:36 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.4 1992/06/29 12:06:36 djh Rel djh $
!  * $Revision: 2.4 $
  */
  
  /*
***************
*** 31,37 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 103;
    myversion.cv_rmonth = "June";
    myversion.cv_ryear = "1992";
    switch (lap_proto) {
--- 31,37 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 104;
    myversion.cv_rmonth = "June";
    myversion.cv_ryear = "1992";
    switch (lap_proto) {
*** README.orig		Wed Jun 24 11:06:05 1992
--- README		Mon Jun 29 22:07:37 1992
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 103, June 1992
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 104, June 1992
  
  Notice
  ------