Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#72555

Browse Source 
r=mkaply, a=blizzard
Code from aaronr - use DosCopy if DosMove fails (OS/2 can't move across drives)
This commit is contained in:
mkaply%us.ibm.com 2001-03-23 03:21:22 +00:00
parent 01aeeb9328
commit 5998a78f6e
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xpcom/io/nsLocalFileOS2.cpp
View File

@ -906,8 +906,18 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const char
if (NS_FAILED(rv))
return rv;
APIRET rc;
if (!move) {
APIRET rc = NO_ERROR;
if( move )
{
rc = DosMove(filePath, (PSZ)NS_CONST_CAST(char*, destPath.get()));
}
if (!move || rc == ERROR_NOT_SAME_DEVICE) {
/* will get an error if the destination and source files aren't on the
* same drive. "MoveFile()" on Windows will go ahead and move the
* file without error, so we need to do the same IBM-AKR
*/
rc = DosCopy(filePath, (PSZ)NS_CONST_CAST(char*, destPath.get()), DCPY_EXISTING);
/* WSOD2 HACK */
if (rc == 65) { // NETWORK_ACCESS_DENIED
@ -926,10 +936,16 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const char
EXEC_SYNC, achProgram, (PSZ)NULL,
&rescResults, achProgram);
rc = 0; // Assume it worked
} /* endif */
} else {
rc = DosMove(filePath, (PSZ)NS_CONST_CAST(char*, destPath.get()));
}
/* moving the file is supposed to act like a rename, so delete the
* original file if we got this far without error IBM-AKR
*/
if( move && (rc == NO_ERROR) )
{
DosDelete( filePath );
}
} /* rc == 65 */
} /* !move or ERROR */
if (rc)
rv = ConvertOS2Error(rc);