mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "deprecated" API for OS X alias resolving on X 10.5

Browse Source 
Change-Id: I68a49b95c9b4f4d1d0472a298f8b29d83435c88e
Reviewed-on: https://gerrit.libreoffice.org/8195
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Douglas Mencken 2014-02-23 15:16:26 -05:00 committed by Norbert Thiebaud
parent 76b114f849
commit 72e8f628e9
1 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sal/osl/unx/system.c
View File

@ -157,6 +157,18 @@ int macxp_resolveAlias(char *path, int buflen)
(void) buflen; (void) buflen;
return 0; return 0;
#else #else
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
FSRef aFSRef;
OSStatus nErr;
Boolean bFolder;
Boolean bAliased;
#else
CFStringRef cfpath;
CFURLRef cfurl;
CFErrorRef cferror;
CFDataRef cfbookmark;
#endif
char *unprocessedPath = path; char *unprocessedPath = path;
if ( *unprocessedPath == '/' ) if ( *unprocessedPath == '/' )
@ -169,12 +181,56 @@ int macxp_resolveAlias(char *path, int buflen)
if ( unprocessedPath ) if ( unprocessedPath )
*unprocessedPath = '\0'; *unprocessedPath = '\0';
CFStringRef cfpath = CFStringCreateWithCString( NULL, path, kCFStringEncodingUTF8 ); #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
CFURLRef cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath, kCFURLPOSIXPathStyle, false ); nErr = noErr;
bFolder = FALSE;
bAliased = FALSE;
if ( FSPathMakeRef( (const UInt8 *)path, &aFSRef, 0 ) == noErr )
{
nErr = FSResolveAliasFileWithMountFlags( &aFSRef, TRUE, &bFolder, &bAliased, kResolveAliasFileNoUI );
if ( nErr == nsvErr )
{
errno = ENOENT;
nRet = -1;
}
else if ( nErr == noErr && bAliased )
{
char tmpPath[ PATH_MAX ];
if ( FSRefMakePath( &aFSRef, (UInt8 *)tmpPath, PATH_MAX ) == noErr )
{
int nLen = strlen( tmpPath ) + ( unprocessedPath ? strlen( unprocessedPath + 1 ) + 1 : 0 );
if ( nLen < buflen && nLen < PATH_MAX )
{
if ( unprocessedPath )
{
int nTmpPathLen = strlen( tmpPath );
strcat( tmpPath, "/" );
strcat( tmpPath, unprocessedPath + 1 );
strcpy( path, tmpPath);
unprocessedPath = path + nTmpPathLen;
}
else if ( !unprocessedPath )
{
strcpy( path, tmpPath);
}
}
else
{
errno = ENAMETOOLONG;
nRet = -1;
}
}
}
}
#else
cfpath = CFStringCreateWithCString( NULL, path, kCFStringEncodingUTF8 );
cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath, kCFURLPOSIXPathStyle, false );
CFRelease( cfpath ); CFRelease( cfpath );
CFErrorRef cferror = NULL; cferror = NULL;
CFDataRef cfbookmark = CFURLCreateBookmarkDataFromFile( NULL, cfurl, &cferror ); cfbookmark = CFURLCreateBookmarkDataFromFile( NULL, cfurl, &cferror );
CFRelease( cfurl ); CFRelease( cfurl );
if ( cfbookmark == NULL ) if ( cfbookmark == NULL )
{ {
if(cferror) if(cferror)
@ -227,6 +283,7 @@ int macxp_resolveAlias(char *path, int buflen)
} }
} }
} }
#endif
if ( unprocessedPath ) if ( unprocessedPath )
*unprocessedPath++ = '/'; *unprocessedPath++ = '/';