gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-07 06:51:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for issue 452

Browse source
This commit is contained in:
rfm 2024-11-03 13:15:20 +00:00
parent ca84bde33b
commit 0271f62ab2
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2024-11-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSFileManager.m: Fix case where positive result of asking
handler whether to proceed was ignored.
2024-11-01 Richard Frith-Macdonald <rfm@gnu.org> 2024-11-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDate.m: Fix returing receiver when earlier/later argument * Source/NSDate.m: Fix returing receiver when earlier/later argument

32
Source/NSFileManager.m
View file

@ -1386,11 +1386,30 @@ static gs_mutex_t classLock = GS_MUTEX_INIT_STATIC;
if ([self createDirectoryAtPath: destination attributes: attrs] == NO) if ([self createDirectoryAtPath: destination attributes: attrs] == NO)
{ {
return [self _proceedAccordingToHandler: handler if (NO == [self _proceedAccordingToHandler: handler
forError: [self _lastError] forError: [self _lastError]
inPath: destination inPath: destination
fromPath: source fromPath: source
toPath: destination]; toPath: destination])
{
return NO;
}
else
{
BOOL dirOK;
/* We may have managed to create the directory but not set
* its attributes ... if so we can continue copying.
*/
if (![self fileExistsAtPath: destination isDirectory: &dirOK])
{
dirOK = NO;
}
if (!dirOK)
{
return NO;
}
}
} }
if ([self _copyPath: source toPath: destination handler: handler] == NO) if ([self _copyPath: source toPath: destination handler: handler] == NO)
@ -3419,8 +3438,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
result = NO; result = NO;
break; break;
} }
/* /* We may have managed to create the directory but not set
* We may have managed to create the directory but not set
* its attributes ... if so we can continue copying. * its attributes ... if so we can continue copying.
*/ */
if (![self fileExistsAtPath: destinationFile isDirectory: &dirOK]) if (![self fileExistsAtPath: destinationFile isDirectory: &dirOK])