Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

* src/base/ftrfork.c: add support for new pathname syntax "..namedfork/rsrc" to access resource fork on Mac OS X.

Browse Source
david-pic-changes
Suzuki, Toshiya (鈴木俊哉) 17 years ago
parent 44b5e57781
commit a6d36573bd
3 changed files with 78 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      ChangeLog
  2. 2
      include/freetype/internal/ftrfork.h
  3. 88
      src/base/ftrfork.c

11
ChangeLog
Unescape View File

@ -1,3 +1,14 @@
2007-12-06 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/ftrfork.c (raccess_guess_darwin_newvfs): New function
to support new pathname syntax "..namedfork/rsrc" to access
a resource fork on Mac OS X. The legacy syntax "/rsrc" does not
work on case-sensitive HFS+.
(raccess_guess_darwin_hfsplus): Fix a bug in the calculation of
buffer size to store a pathname.
* include/freetype/internal/ftrfork.h: Increment the number of
resource fork guessing rule.
2007-12-06 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/unix/configure.raw: improve the compile tests to search

2
include/freetype/internal/ftrfork.h
Unescape View File

@ -34,7 +34,7 @@ FT_BEGIN_HEADER
/* Number of guessing rules supported in `FT_Raccess_Guess'. */
/* Don't forget to increment the number if you add a new guessing rule. */
#define FT_RACCESS_N_RULES 8
#define FT_RACCESS_N_RULES 9
/*************************************************************************/

88
src/base/ftrfork.c
Unescape View File

@ -227,7 +227,7 @@
typedef FT_Error
(*raccess_guess_func)( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
@ -235,56 +235,63 @@
static FT_Error
raccess_guess_apple_double( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_apple_single( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_darwin_ufs_export( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_darwin_newvfs( FT_Library library,
FT_Stream stream,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_darwin_hfsplus( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_vfat( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_linux_cap( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_linux_double( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
static FT_Error
raccess_guess_linux_netatalk( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset );
@ -298,7 +305,7 @@
static FT_Error
raccess_guess_apple_generic( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
FT_Int32 magic,
FT_Long *result_offset );
@ -329,6 +336,7 @@
raccess_guess_apple_double,
raccess_guess_apple_single,
raccess_guess_darwin_ufs_export,
raccess_guess_darwin_newvfs,
raccess_guess_darwin_hfsplus,
raccess_guess_vfat,
raccess_guess_linux_cap,
@ -358,7 +366,7 @@
static FT_Error
raccess_guess_apple_double( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -377,7 +385,7 @@
static FT_Error
raccess_guess_apple_single( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -396,7 +404,7 @@
static FT_Error
raccess_guess_darwin_ufs_export( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -426,7 +434,7 @@
static FT_Error
raccess_guess_darwin_hfsplus( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -443,7 +451,7 @@
memory = library->memory;
if ( base_file_len > FT_INT_MAX )
if ( base_file_len + 6 > FT_INT_MAX )
return FT_Err_Array_Too_Large;
if ( FT_ALLOC( newpath, base_file_len + 6 ) )
@ -459,10 +467,46 @@
}
static FT_Error
raccess_guess_darwin_newvfs( FT_Library library,
FT_Stream stream,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
/*
Only meaningful on systems with Mac OS X (> 10.1).
*/
FT_Error error;
char* newpath;
FT_Memory memory;
FT_Long base_file_len = ft_strlen( base_file_name );
FT_UNUSED( stream );
memory = library->memory;
if ( base_file_len + 18 > FT_INT_MAX )
return FT_Err_Array_Too_Large;
if ( FT_ALLOC( newpath, base_file_len + 18 ) )
return error;
FT_MEM_COPY( newpath, base_file_name, base_file_len );
FT_MEM_COPY( newpath + base_file_len, "/..namedfork/rsrc", 18 );
*result_file_name = newpath;
*result_offset = 0;
return FT_Err_Ok;
}
static FT_Error
raccess_guess_vfat( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -489,7 +533,7 @@
static FT_Error
raccess_guess_linux_cap( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -515,7 +559,7 @@
static FT_Error
raccess_guess_linux_double( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -546,7 +590,7 @@
static FT_Error
raccess_guess_linux_netatalk( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
char **result_file_name,
FT_Long *result_offset )
{
@ -578,7 +622,7 @@
static FT_Error
raccess_guess_apple_generic( FT_Library library,
FT_Stream stream,
char * base_file_name,
char *base_file_name,
FT_Int32 magic,
FT_Long *result_offset )
{
@ -639,7 +683,7 @@
static FT_Error
raccess_guess_linux_double_from_file_name( FT_Library library,
char * file_name,
char *file_name,
FT_Long *result_offset )
{
FT_Open_Args args2;
@ -711,7 +755,7 @@
FT_BASE_DEF( void )
FT_Raccess_Guess( FT_Library library,
FT_Stream stream,
char* base_name,
char *base_name,
char **new_names,
FT_Long *offsets,
FT_Error *errors )

Write Preview
Loading…
Cancel
Save