[Squeak-Commits] squeak/platforms/Mac OS/vm sqMacFileLogic.h,1.4,1.5

[John M M. <jo...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14439/squeak/platforms/Mac OS/vm

Modified Files:
	sqMacFileLogic.h 
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time. 

Index: sqMacFileLogic.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacFileLogic.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqMacFileLogic.h	22 Jan 2002 19:10:27 -0000	1.4
--- sqMacFileLogic.h	2 Dec 2003 04:52:26 -0000	1.5
***************
*** 12,18 ****
--- 12,22 ----
  *	Jan 2nd 2002 JMM added logic to make lookups faster
  *	Jan 22nd 2002 JMM squeak file type offset change
+ *       Nov 25th 2003 JMM add gCurrentVMEncoding
+         3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
  */
  #if TARGET_API_MAC_CARBON
      #include <Carbon/Carbon.h>
+     extern CFStringEncoding gCurrentVMEncoding;
+ 
  #else
  	#include <Navigation.h>
***************
*** 24,33 ****
  	#include <Gestalt.h>
  	#include <string.h>	
  #endif
  
  OSErr	FSMakeFSSpecCompat(short vRefNum, long dirID, ConstStr255Param fileName,  FSSpec *spec);
  OSStatus GetApplicationDirectory(FSSpec *workingDirectory);
! int PathToDir(char *pathName, int pathNameMax, FSSpec *workingDirectory);
! int PathToFile(char *pathName, int pathNameMax, FSSpec *workingDirectory);
  OSErr makeFSSpec(char *pathString, int pathStringLength, FSSpec *spec);
  							   
--- 28,38 ----
  	#include <Gestalt.h>
  	#include <string.h>	
+ 	extern UInt32 gCurrentVMEncoding;
  #endif
  
  OSErr	FSMakeFSSpecCompat(short vRefNum, long dirID, ConstStr255Param fileName,  FSSpec *spec);
  OSStatus GetApplicationDirectory(FSSpec *workingDirectory);
! int PathToDir(char *pathName, int pathNameMax, FSSpec *workingDirectory,UInt32 encoding);
! int PathToFile(char *pathName, int pathNameMax, FSSpec *workingDirectory,UInt32 encoding);
  OSErr makeFSSpec(char *pathString, int pathStringLength, FSSpec *spec);