Patch #: 161 Type: bug fix ("the STAT_CACHE bug") Priority: high Affects: sites running AUFS with STAT_CACHE defined Reported: Nick Kisseberth Archived: munnari.OZ.AU mac/cap.patches/cap60.patch161 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch161' Summary: don't try to delete the "current" directory (EINVAL) File: cap60/applications/aufs/afpfile.c *** applications/aufs/afpfile.c.orig Thu Feb 28 23:44:23 1991 --- applications/aufs/afpfile.c Mon Sep 13 18:18:38 1993 *************** *** 1,8 **** /* ! * $Author: djh $ $Date: 91/02/15 21:06:58 $ ! * $Header: afpfile.c,v 2.1 91/02/15 21:06:58 djh Rel $ ! * $Revision: 2.1 $ ! */ /* * afpfile.c - Appletalk Filing Protocol File Level Routines --- 1,9 ---- /* ! * $Author: djh $ $Date: 1993/09/13 08:18:27 $ ! * $Header: /mac/src/cap60/applications/aufs/RCS/afpfile.c,v 2.2 1993/09/13 08:18:27 djh Rel djh $ ! * $Revision: 2.2 $ ! * ! */ /* * afpfile.c - Appletalk Filing Protocol File Level Routines *************** *** 18,25 **** * */ - /* PATCH: PC.aufs/afpfile.c.diffs, djh@munnari.OZ.AU, 15/11/90 */ - /* * Non OS dependant support routines for: * --- 19,24 ---- *************** *** 243,258 **** --- 242,266 ---- char file[MAXUFLEN]; ntohPackX(PsDelete,p,l,(byte *) &del); + err = EtoIfile(file,&idir,&ipdir,&ivol,del.del_dirid, del.del_volid,del.del_ptype,del.del_path); + if (err != noErr) return(err); if (DBFIL) printf("FPDelete: path=%s file=%s\n",pathstr(ipdir),file); + + #ifdef STAT_CACHE + OScd(pathstr(ipdir)); /* so we don't try and delete current directory */ + #endif STAT_CACHE + err = OSDelete(ipdir,idir,file); + if (err == noErr) /* if success */ VolModified(ivol); /* then volume modified */ + return(err); } *** lib/cap/abversion.c.orig Mon Sep 13 17:03:36 1993 --- lib/cap/abversion.c Mon Sep 13 18:20:12 1993 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1993/09/13 07:03:28 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.59 1993/09/13 07:03:28 djh Rel djh $ ! * $Revision: 2.59 $ * */ --- 1,7 ---- /* ! * $Author: djh $ $Date: 1993/09/13 08:20:05 $ ! * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.60 1993/09/13 08:20:05 djh Rel djh $ ! * $Revision: 2.60 $ * */ *************** *** 32,38 **** myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 160; myversion.cv_rmonth = "September"; myversion.cv_ryear = "1993"; switch (lap_proto) { --- 32,38 ---- myversion.cv_name = "CAP"; myversion.cv_version = 6; myversion.cv_subversion = 0; ! myversion.cv_patchlevel = 161; myversion.cv_rmonth = "September"; myversion.cv_ryear = "1993"; switch (lap_proto) { *** README.orig Mon Sep 13 17:04:19 1993 --- README Mon Sep 13 18:21:22 1993 *************** *** 2,8 **** CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 160, September 1993 Notice ------ --- 2,8 ---- CAP - Columbia AppleTalk Package for UNIX o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 161, September 1993 Notice ------