Patch #:	183
Type:		bug fix
Priority:	high
Affects:	sites running AUFS on little-endian machines
Reported:	Dominique Marcadet <Dominique.Marcadet@supelec.fr> 
Reported:	Magnus Hjern <Magnus.Hjern@malmo.trab.se>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch183
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch183'
Summary:	do byteswapping after time calculations
File:		cap60/lib/afp/afpcmd.c

*** lib/afp/afpcmd.c.orig	Wed Nov 24 22:06:08 1993
--- lib/afp/afpcmd.c		Fri Dec 24 15:09:13 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/11/24 11:05:12 $
!  * $Header: /mac/src/cap60/lib/afp/RCS/afpcmd.c,v 2.3 1993/11/24 11:05:12 djh Rel djh $
!  * $Revision: 2.3 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/12/24 04:08:54 $
!  * $Header: /mac/src/cap60/lib/afp/RCS/afpcmd.c,v 2.4 1993/12/24 04:08:54 djh Rel djh $
!  * $Revision: 2.4 $
   *
   */
  
***************
*** 342,358 ****
      break;
    case P_TIME:				/* internal to external time conv. */
      t = (byte *)&sdwrd;
- #ifdef BYTESWAPPED
-     t[0] = s[3];
-     t[1] = s[2];
-     t[2] = s[1];
-     t[3] = s[0];
- #else  BYTESWAPPED
      t[0] = s[0];
      t[1] = s[1];
      t[2] = s[2];
      t[3] = s[3];
- #endif BYTESWAPPED
      if (mactime_not_inited)
        InitPackTime(0);			/* assume version 1.0 obsolete */
      if ((time_t)sdwrd == 0)
--- 342,351 ----
***************
*** 359,368 ****
--- 352,368 ----
        sdwrd = maczerotime;
      else
        sdwrd += mymactime;
+ #ifdef BYTESWAPPED
+     d[0] = t[3];
+     d[1] = t[2];
+     d[2] = t[1];
+     d[3] = t[0];
+ #else  BYTESWAPPED
      d[0] = t[0];
      d[1] = t[1];
      d[2] = t[2];
      d[3] = t[3];
+ #endif BYTESWAPPED
      *di += 4;				/* advance */
      break;
    case P_PSTR:				/* c to pascal string */
*** lib/cap/abversion.c.orig	Tue Dec  7 20:29:21 1993
--- lib/cap/abversion.c		Fri Dec 24 15:10:53 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/12/07 09:29:16 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.82 1993/12/07 09:29:16 djh Rel djh $
!  * $Revision: 2.82 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/12/24 04:10:46 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.83 1993/12/24 04:10:46 djh Rel djh $
!  * $Revision: 2.83 $
   *
   */
  
***************
*** 32,38 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 182;
    myversion.cv_rmonth = "December";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
--- 32,38 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 183;
    myversion.cv_rmonth = "December";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
*** README.orig		Tue Dec  7 20:30:34 1993
--- README		Fri Dec 24 15:11:46 1993
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 182, December 1993
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 183, December 1993
  
  Notice
  ------