corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 54008 - nsIFile::MoveTo doesn't work according to API on Mac.

Browse Source
This commit is contained in:
ccarlen@netscape.com
2001-01-17 20:23:06 +00:00
parent 96c5228b94
commit dcb7b51aee
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xpcom/io/nsLocalFileMac.cpp
View File

@@ -1390,24 +1390,34 @@ nsLocalFile::GetPath(char **_retval)
nsresult nsLocalFile::MoveCopy( nsIFile* newParentDir, const char* newName, PRBool isCopy ) nsresult nsLocalFile::MoveCopy( nsIFile* newParentDir, const char* newName, PRBool isCopy )
{ {
nsresult rv = ResolveAndStat( PR_TRUE ); nsresult rv = ResolveAndStat( PR_TRUE );
if ( NS_FAILED( rv ) ) if ( NS_FAILED( rv ) )
return rv; return rv;
OSErr macErr;
FSSpec srcSpec = mResolvedSpec;
Str255 newPascalName;
// If newParentDir == nsnull, it's a simple rename
if ( !newParentDir )
{
NS_ENSURE_ARG( newName );
myPLstrncpy( newPascalName, newName, 255 );
macErr = ::FSpRename( &srcSpec, newPascalName );
return MacErrorMapper( macErr );
}
nsCOMPtr<nsILocalFileMac> destDir( do_QueryInterface( newParentDir )); nsCOMPtr<nsILocalFileMac> destDir( do_QueryInterface( newParentDir ));
FSSpec destSpec;
PRBool isDirectory; PRBool isDirectory;
rv = newParentDir->IsDirectory( &isDirectory ); rv = newParentDir->IsDirectory( &isDirectory );
if ( NS_FAILED( rv ) ) if ( NS_FAILED( rv ) )
return rv; return rv;
FSSpec srcSpec;
FSSpec destSpec;
srcSpec = mResolvedSpec;
rv = destDir->GetResolvedFSSpec( &destSpec ); rv = destDir->GetResolvedFSSpec( &destSpec );
if ( NS_FAILED( rv ) ) if ( NS_FAILED( rv ) )
return rv; return rv;
OSErr macErr;
Str255 newPascalName;
if ( newName ) if ( newName )
myPLstrncpy( newPascalName, newName, 255); myPLstrncpy( newPascalName, newName, 255);
else else