[Squeak-Commits] squeak/platforms/Mac OS/plugins/FilePlugin sqMacDirectory.c,1.8,1.9

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

Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv14307/squeak/platforms/Mac OS/plugins/FilePlugin

Modified Files:
	sqMacDirectory.c 
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: sqMacDirectory.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/FilePlugin/sqMacDirectory.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sqMacDirectory.c	20 Jun 2003 01:43:45 -0000	1.8
--- sqMacDirectory.c	2 Dec 2003 04:52:02 -0000	1.9
***************
*** 25,28 ****
--- 25,29 ----
   3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
   3.5.1b1 May 20th, 2003 JMM isDirectory ? ENTRY_FOUND versus always found because path could be a file. 
+  3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
   */
  
***************
*** 102,106 ****
          long            tokenLength;
          
!         filePath   = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),kCFStringEncodingMacRoman,false);
          if (filePath == nil) 
              return false;
--- 103,107 ----
          long            tokenLength;
          
!         filePath   = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)cFileName,strlen(cFileName),gCurrentVMEncoding,false);
          if (filePath == nil) 
              return false;
***************
*** 475,479 ****
          
  		
!         filePath   = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)name,strlen(name),kCFStringEncodingMacRoman,false);
          if (filePath == nil) 
              return __io_error;
--- 476,480 ----
          
  		
!         filePath   = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)name,strlen(name),gCurrentVMEncoding,false);
          if (filePath == nil) 
              return __io_error;